[MPlayer-cvslog] r36172 - trunk/libmpdemux/demux_lavf.c

[cboesch]

Author: cboesch
Date: Thu Apr 18 23:54:53 2013
New Revision: 36172

Log:
Add support for AV_CODEC_ID_ASS.

Lavf/mkv will output proper ASS packet at next bump. MPlayer code base already
supports such packets, so only a trivial change is required.

See 7c1a002c78f15470f76d5c03e619b954d1a22839 in FFmpeg git history for more
information.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Mon Apr 15 04:23:17 2013	(r36171)
+++ trunk/libmpdemux/demux_lavf.c	Thu Apr 18 23:54:53 2013	(r36172)
@@ -441,7 +441,11 @@ static void handle_stream(demuxer_t *dem
                 type = 't';
             else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT)
                 type = 'm';
-            else if (codec->codec_id == AV_CODEC_ID_SSA)
+            else if (codec->codec_id == AV_CODEC_ID_SSA
+#if LIBAVUTIL_VERSION_MICRO >= 100
+                     || codec->codec_id == AV_CODEC_ID_ASS
+#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
+                )
                 type = 'a';
             else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
                 type = 'v';