Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
34760:ca982f21b1e4 34761:02a03e00341e
437 type = 'b'; 437 type = 'b';
438 else if(codec->codec_id == CODEC_ID_DVB_TELETEXT) 438 else if(codec->codec_id == CODEC_ID_DVB_TELETEXT)
439 type = 'd'; 439 type = 'd';
440 else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE) 440 else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE)
441 type = 'p'; 441 type = 'p';
442 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100)
443 else if(codec->codec_id == CODEC_ID_EIA_608)
444 type = 'c';
445 #endif
446 else if(codec->codec_tag == MKTAG('c', '6', '0', '8'))
447 type = 'c';
442 else 448 else
443 break; 449 break;
444 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams, lang ? lang->value : NULL); 450 sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams, lang ? lang->value : NULL);
445 if(!sh_sub) break; 451 if(!sh_sub) break;
446 stream_type = "subtitle"; 452 stream_type = "subtitle";