diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-07 03:41:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 22:59:50 +0200 |
| commit | 54bec22a6e3f2115eac1c2f079c25dcb19b2813e (patch) | |
| tree | e33f05b8d66f3e320a43518cb32edffd6f8fc70c | |
| parent | e1b2c93a23077ce60340241eca96f3fa10b89ec3 (diff) | |
| download | ffmpeg-54bec22a6e3f2115eac1c2f079c25dcb19b2813e.tar.gz | |
avformat/h263dec/h263_probe: Check TR
Fixes missdetection of Misdetection_345.mp3
Fixes missdetection of Misdetection_421.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd20b93e2f5171054d6b3dd9daee1e832c1f9090)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/h263dec.c | 8 |
1 files changed, 8 insertions, 0 deletions
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; i<p->buf_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<last_gn){ |