From cd20b93e2f5171054d6b3dd9daee1e832c1f9090 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 7 May 2014 03:41:41 +0200 Subject: [PATCH] avformat/h263dec/h263_probe: Check TR Fixes missdetection of Misdetection_345.mp3 Fixes missdetection of Misdetection_421.mp3 Signed-off-by: Michael Niedermayer --- libavformat/h263dec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c index a581d4c4b5..145fb85902 100644 --- a/libavformat/h263dec.c +++ b/libavformat/h263dec.c @@ -31,16 +31,23 @@ static int h263_probe(AVProbeData *p) int res_change=0; int src_fmt, last_src_fmt=-1; int last_gn=0; + int tr, last_tr = -1; for(i=0; ibuf_size; i++){ code = (code<<8) + p->buf[i]; if ((code & 0xfffffc000000) == 0x80000000) { + tr = (code >> 18) & 0xFF; src_fmt= (code>>10)&7; if( src_fmt != last_src_fmt && last_src_fmt>0 && last_src_fmt<6 && src_fmt<6) res_change++; + if (tr == last_tr) { + invalid_psc++; + continue; + } + if (src_fmt != 7 && !(code&(1<<9)) && (code&(1<<5))) { invalid_psc++; continue; @@ -52,6 +59,7 @@ static int h263_probe(AVProbeData *p) }else invalid_psc++; last_src_fmt= src_fmt; + last_tr = tr; } else if((code & 0xffff80000000) == 0x80000000) { int gn= (code>>(31-5)) & 0x1F; if(gn