From df59c9c0f85bd46170f2fc6977699c4e6d877977 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 4 Dec 2010 05:44:18 +0000 Subject: [PATCH] Detect incorrect padding with wrong stuffing codes used by NEC N-02B. I dont know if this is the best way to handle it. But it fixes http://kuwatan.jp/temp/n-02b.3gp Fixes issue 2373. Originally committed as revision 25875 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263dec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index b0a3a8a7fe..04417c256d 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -261,6 +261,13 @@ static int decode_slice(MpegEncContext *s){ assert(s->mb_x==0 && s->mb_y==s->mb_height); + if(s->codec_id==CODEC_ID_MPEG4 + && (s->workaround_bugs&FF_BUG_AUTODETECT) + && get_bits_left(&s->gb) >= 48 + && show_bits(&s->gb, 24)==0x4010 + && !s->data_partitioning) + s->padding_bug_score+=32; + /* try to detect the padding bug */ if( s->codec_id==CODEC_ID_MPEG4 && (s->workaround_bugs&FF_BUG_AUTODETECT)