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/msmpeg4dec.c | |
| parent | d9b264bc73723ce538d72f28a4a8fb4f85af7eca (diff) | |
| parent | 9c1db92ad372d4cd69e0490e691c56e4097cb193 (diff) | |
| download | ffmpeg-d5227ceff13e52eddf1fd02e0042ebc9aa628791.tar.gz | |
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/msmpeg4dec.c')
| -rw-r--r-- | libavcodec/msmpeg4dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 942a181f57..c492fdbe48 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -843,7 +843,9 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, i-= 192; if(i&(~63)){ const int left= get_bits_left(&s->gb); - if(((i+192 == 64 && level/qmul==-1) || !(s->err_recognition&(AV_EF_BITSTREAM|AV_EF_COMPLIANT))) && left>=0){ + if (((i + 192 == 64 && level / qmul == -1) || + !(s->avctx->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))) && + left >= 0) { av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y); i = 63; break; |