aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJosh Allmann <joshua.allmann@gmail.com>2014-10-03 09:42:25 -0700
committerAnton Khirnov <anton@khirnov.net>2014-10-07 07:30:32 +0000
commit9a03c2323593173a201cb75edd1b49887cf811ed (patch)
treef0a71c0c5665a9c922ffdc4007f5734859fb343b /libavcodec
parentd208d1eba3799c58fd6d3602d31de3e686f14aec (diff)
downloadffmpeg-9a03c2323593173a201cb75edd1b49887cf811ed.tar.gz
h263dec: Force padding bug workaround for H.263.
Fixes decoding of http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263 Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263dec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index cfb77b078f..a6252f2905 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -316,7 +316,8 @@ static int decode_slice(MpegEncContext *s)
}
if (s->workaround_bugs & FF_BUG_AUTODETECT) {
- if (s->padding_bug_score > -2 && !s->data_partitioning)
+ if (s->codec_id == AV_CODEC_ID_H263 ||
+ (s->padding_bug_score > -2 && !s->data_partitioning))
s->workaround_bugs |= FF_BUG_NO_PADDING;
else
s->workaround_bugs &= ~FF_BUG_NO_PADDING;