[FFmpeg-cvslog] avformat/mpegts: Check adaption field control in analyze() more instead of transport_error_indicator

Michael Niedermayer git at videolan.org
Sun Apr 10 13:34:06 CEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Apr 10 13:08:00 2016 +0200| [ee7a642b0e5da1730cfc66008d2f2976fa37a692] | committer: Michael Niedermayer

avformat/mpegts: Check adaption field control in analyze() more instead of transport_error_indicator

transport_error_indicator is not required to be 0

Fixes probing
Fixes Ticket 4862

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee7a642b0e5da1730cfc66008d2f2976fa37a692
---

 libavformat/mpegts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index e44da1f..772fe47 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -543,7 +543,7 @@ static int analyze(const uint8_t *buf, int size, int packet_size, int *index,
 
     for (i = 0; i < size - 3; i++) {
         if (buf[i] == 0x47 &&
-            (!probe || (!(buf[i + 1] & 0x80) && buf[i + 3] != 0x47))) {
+            (!probe || (buf[i + 3] & 0x30))) {
             int x = i % packet_size;
             stat[x]++;
             stat_all++;



More information about the ffmpeg-cvslog mailing list