Mercurial > mplayer.hg

changeset 36078:c297c1a78ae6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author cboesch
date Thu, 18 Apr 2013 21:54:53 +0000
parents bb7b0b97c1e4
children 4c42154f7aa3
files libmpdemux/demux_lavf.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Mon Apr 15 02:23:17 2013 +0000
+++ b/libmpdemux/demux_lavf.c	Thu Apr 18 21:54:53 2013 +0000
@@ -441,7 +441,11 @@
                 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';