[vlc-commits] demux: avformat: rebuild full frame for DVB subs

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Dec 18 17:28:04 2017 +0100| [83fb3408ae35498f0408a4cbcdc6b26f04041c01] | committer: Francois Cartegnie

demux: avformat: rebuild full frame for DVB subs

Out internal format.
Has never interoperated with decoders outside of avcodec

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83fb3408ae35498f0408a4cbcdc6b26f04041c01
---

 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 815fff3880..2c4d01325f 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -492,8 +492,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 ) |
@@ -757,8 +756,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 )
         {