diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:38:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:38:42 +0200 |
| commit | d5227ceff13e52eddf1fd02e0042ebc9aa628791 (patch) | |
| tree | ca15b06625ef047c64caab1069ee39643df4fa8a /libavcodec/h263dec.c | |
| parent | d9b264bc73723ce538d72f28a4a8fb4f85af7eca (diff) | |
| parent | 9c1db92ad372d4cd69e0490e691c56e4097cb193 (diff) | |
Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'
* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193':
mpegvideo: Drop err_recognition
Conflicts:
libavcodec/h263dec.c
libavcodec/ituh263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 7faf12009b..1c68ec12e7 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -287,7 +287,7 @@ static int decode_slice(MpegEncContext *s) ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR & part_mask); - if (s->err_recognition & AV_EF_IGNORE_ERR) + if (s->avctx->err_recognition & AV_EF_IGNORE_ERR) continue; return AVERROR_INVALIDDATA; } @@ -376,7 +376,7 @@ static int decode_slice(MpegEncContext *s) /* buggy padding but the frame should still end approximately at * the bitstream end */ if ((s->workaround_bugs & FF_BUG_NO_PADDING) && - (s->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE))) + (s->avctx->err_recognition & (AV_EF_BUFFER|AV_EF_AGGRESSIVE))) max_extra += 48; else if ((s->workaround_bugs & FF_BUG_NO_PADDING)) max_extra += 256 * 256 * 256 * 64; |