Mercurial > mplayer.hg
diff mpcommon.c @ 34761:02a03e00341e
Support EIA-608 captions in MOV.
author | reimar |
---|---|
date | Sat, 07 Apr 2012 20:08:53 +0000 |
parents | 5761a9a31bcb |
children | 99ac85950277 |
line wrap: on
line diff
--- a/mpcommon.c Sat Apr 07 19:37:11 2012 +0000 +++ b/mpcommon.c Sat Apr 07 20:08:53 2012 +0000 @@ -46,6 +46,7 @@ #include "sub/ass_mp.h" #include "sub/vobsub.h" #include "sub/av_sub.h" +#include "sub/sub_cc.h" #include "libmpcodecs/dec_teletext.h" #include "libavutil/intreadwrite.h" #include "m_option.h" @@ -181,6 +182,7 @@ if (is_av_sub(type)) reset_avsub(d_dvdsub->sh); #endif + subcc_reset(); } // find sub if (subdata) { @@ -240,7 +242,7 @@ if (vo_vobsub || timestamp >= 0) spudec_assemble(vo_spudec, packet, len, timestamp); } - } else if (is_text_sub(type) || is_av_sub(type) || type == 'd') { + } else if (is_text_sub(type) || is_av_sub(type) || type == 'd' || type == 'c') { int orig_type = type; double endpts; if (type == 'd' && !d_dvdsub->demuxer->teletext) { @@ -287,6 +289,10 @@ } continue; } + if (type == 'c') { + subcc_process_data(packet, len); + continue; + } #ifdef CONFIG_ASS if (ass_enabled) { sh_sub_t* sh = d_dvdsub->sh;