]> git.sesse.net Git - vlc/commitdiff
demux: ts: remove PES full header check
authorFrancois Cartegnie <fcvlcdev@free.fr>
Tue, 10 Mar 2015 13:18:32 +0000 (14:18 +0100)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Tue, 10 Mar 2015 13:20:58 +0000 (14:20 +0100)
Some full headers (including filling) are more than 34 bytes.
Now fail late parsing it, and relegate header>packet size check
to caller.

modules/demux/ts.c

index adacd469884f07543655bba7a830db94cd0a8df3..8a49cdefdd3f0bb8282e7ce511d3c790558bd104 100644 (file)
@@ -2136,8 +2136,6 @@ static int ParsePESHeader( demux_t *p_demux, const uint8_t *p_header, size_t i_h
         {
             /* mpeg2 PES */
             i_skip = p_header[8] + 9;
-            if( i_header < i_skip )
-                return VLC_EGENERIC;
 
             if( p_header[7]&0x80 )    /* has pts */
             {
@@ -2203,9 +2201,6 @@ static int ParsePESHeader( demux_t *p_demux, const uint8_t *p_header, size_t i_h
         break;
     }
 
-    if( i_header < i_skip )
-        return VLC_EGENERIC;
-
     *pi_skip = i_skip;
     return VLC_SUCCESS;
 }