[vlc-commits] demux: ts: fix TopField probing test

Francois Cartegnie git at videolan.org
Wed Apr 5 20:17:55 CEST 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Apr  5 20:16:07 2017 +0200| [07e803839a3038afb0b0a42a5dceef642faf847a] | committer: Francois Cartegnie

demux: ts: fix TopField probing test

refs archive/all/mpegts%2Bmpeg2video%2Bmp2%2Bdvbsub%2Btopfield.rec

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

 modules/demux/mpeg/ts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 5fbdae2..df1c32e 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -257,7 +257,7 @@ static int DetectPVRHeadersAndHeaderSize( demux_t *p_demux, unsigned *pi_header_
         return -1;
 
     if( memcmp( p_peek, "TFrc", 4 ) == 0 &&
-        p_peek[6] == 0 && memcmp( &p_peek[53], "\x80\x00\x00", 4 ) == 0 &&
+        p_peek[6] == 0 && ((GetDWBE(&p_peek[53]) & 0x7FFFFF00U) == 0x00) &&
         vlc_stream_Peek( p_demux->s, &p_peek, TOPFIELD_HEADER_SIZE + TS_PACKET_SIZE_MAX )
             == TOPFIELD_HEADER_SIZE + TS_PACKET_SIZE_MAX )
     {



More information about the vlc-commits mailing list