vlc/vlc-3.0 | branch: master | Francois Cartegnie <[email protected]> | Mon Dec 18 17:28:04 2017 +0100| [96359a5590b5f751b80bde69c8e7dfdf5054accc] | committer: Jean-Baptiste Kempf
demux: avformat: rebuild full frame for DVB subs Out internal format. Has never interoperated with decoders outside of avcodec (cherry picked from commit 83fb3408ae35498f0408a4cbcdc6b26f04041c01) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=96359a5590b5f751b80bde69c8e7dfdf5054accc --- modules/demux/avformat/demux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c index a1aea549cd..30d97434f0 100644 --- a/modules/demux/avformat/demux.c +++ b/modules/demux/avformat/demux.c @@ -501,8 +501,7 @@ int avformat_OpenDemux( vlc_object_t *p_this ) free( psz_buf ); } } - else if( !strcmp( p_sys->ic->iformat->name, "wtv" ) && - cp->codec_id == AV_CODEC_ID_DVB_SUBTITLE && + else if( cp->codec_id == AV_CODEC_ID_DVB_SUBTITLE && cp->extradata_size > 3 ) { es_fmt.subs.dvb.i_id = GetWBE( cp->extradata ) | @@ -766,8 +765,7 @@ static int Demux( demux_t *p_demux ) return 1; } } - else if( !strcmp( p_sys->fmt->name, "wtv" ) && - p_stream->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE ) + else if( p_stream->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE ) { if( ( p_frame = block_Alloc( pkt.size + 3 ) ) == NULL ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
