[FFmpeg-cvslog] mpegts: Completely ignore H222 spec and consider reserved adaption

Michael Niedermayer git at videolan.org
Tue Nov 15 04:28:50 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 15 04:15:34 2011 +0100| [7ea396381743c300f8450baa3054b62b1f3e68d0] | committer: Michael Niedermayer

mpegts: Completely ignore H222 spec and consider reserved adaption
 fields to be perfectly fine mpeg TS.
Fixes Ticket580

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mpegts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 118f532..d3f8a8a 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -399,7 +399,7 @@ static int analyze(const uint8_t *buf, int size, int packet_size, int *index){
     memset(stat, 0, packet_size*sizeof(int));
 
     for(x=i=0; i<size-3; i++){
-        if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && (buf[i+3] & 0x30)){
+        if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && buf[i+3] != 0x47){
             stat[x]++;
             if(stat[x] > best_score){
                 best_score= stat[x];



More information about the ffmpeg-cvslog mailing list