diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-07 14:49:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-07 15:00:08 +0400 |
| commit | aba873bbd057a5fd982496568fa04c6a23a60689 (patch) | |
| tree | 6e73908f8d1dabe053ca356f18249d549ee60e44 /libavcodec/h263dec.c | |
| parent | 33c8500db4e25b7883e4655ba7db798542d05afc (diff) | |
| parent | 9a03c2323593173a201cb75edd1b49887cf811ed (diff) | |
Merge commit '9a03c2323593173a201cb75edd1b49887cf811ed'
* commit '9a03c2323593173a201cb75edd1b49887cf811ed':
h263dec: Force padding bug workaround for H.263.
This is not merged as it breaks a good part of the error concealment/resilience for H.263
Also, messenger.h263 plays fine in ffmpeg.
If anyone has any other h263 files that do not work, please open an issue on trak or
mail me!
See: d225b0f7aaa65eafccc87165130e1c4bab71708b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e5870faa29..6a60fbabaf 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -345,7 +345,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->padding_bug_score > -2 && !s->data_partitioning)) s->workaround_bugs |= FF_BUG_NO_PADDING; else s->workaround_bugs &= ~FF_BUG_NO_PADDING; |