ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Fri Oct 
 3 12:32:21 2014 +0200| [8acfae6901111a9ba93f51fff727fb84bf93fc3c] | committer: 
Michael Niedermayer

avcodec/h263dec: Fix decoding messenger.h263

Fixes http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263
Fixes regression since b239f3f6

Found-by: Josh Allmann
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit d225b0f7aaa65eafccc87165130e1c4bab71708b)

Conflicts:

        libavcodec/h263dec.c

Signed-off-by: Michael Niedermayer <[email protected]>

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

 libavcodec/h263dec.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 6324e9b..3e8bc84 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -319,6 +319,14 @@ static int decode_slice(MpegEncContext *s)
         }
     }
 
+    if (s->codec_id == AV_CODEC_ID_H263          &&
+        (s->workaround_bugs & FF_BUG_AUTODETECT) &&
+        get_bits_left(&s->gb) >= 64              &&
+        AV_RB64(s->gb.buffer_end - 8) == 0xCDCDCDCDFC7F0000) {
+
+        s->padding_bug_score += 32;
+    }
+
     if (s->workaround_bugs & FF_BUG_AUTODETECT) {
         if (s->padding_bug_score > -2 && !s->data_partitioning)
             s->workaround_bugs |= FF_BUG_NO_PADDING;

_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to