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/ituh263dec.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/ituh263dec.c')
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 8398dd9ab6..c41e600809 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -460,7 +460,7 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block, level = get_bits(&s->gb, 8); if((level&0x7F) == 0){ av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y); - if(s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT)) + if (s->avctx->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT)) return -1; } if (level == 255) |