Mercurial > mplayer.hg

diff libmpdemux/demux_lavf.c @ 34761:02a03e00341e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support EIA-608 captions in MOV.
author reimar
date Sat, 07 Apr 2012 20:08:53 +0000
parents ca982f21b1e4
children 0ba5ba56f6d0
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Sat Apr 07 19:37:11 2012 +0000
+++ b/libmpdemux/demux_lavf.c	Sat Apr 07 20:08:53 2012 +0000
@@ -439,6 +439,12 @@
                 type = 'd';
             else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE)
                 type = 'p';
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100)
+            else if(codec->codec_id == CODEC_ID_EIA_608)
+                type = 'c';
+#endif
+            else if(codec->codec_tag == MKTAG('c', '6', '0', '8'))
+                type = 'c';
             else
                 break;
             sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams, lang ? lang->value : NULL);