diff options
| author | Dustin Brody <libav@parsoma.net> | 2011-10-22 08:44:16 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-22 14:49:55 +0200 |
| commit | 9abc98737fe12ee67ddb7d52e9d497d4de2bac6c (patch) | |
| tree | 35b72173105b169278e263f6d77129b84beea823 /libavcodec/h264.c | |
| parent | 5ea0001f9eadcbe2ab4ff934c788db04d9704e30 (diff) | |
| download | ffmpeg-9abc98737fe12ee67ddb7d52e9d497d4de2bac6c.tar.gz | |
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 17124c3088..3f711c6ec7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2827,7 +2827,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ff_thread_report_progress((AVFrame*)s->current_picture_ptr, INT_MAX, 1); ff_generate_sliding_window_mmcos(h); if (ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index) < 0 && - s->avctx->error_recognition >= FF_ER_EXPLODE) + (s->avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; /* Error concealment: if a ref is missing, copy the previous ref in its place. * FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions @@ -3005,7 +3005,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } if(h->nal_ref_idc && ff_h264_decode_ref_pic_marking(h0, &s->gb) < 0 && - s->avctx->error_recognition >= FF_ER_EXPLODE) + (s->avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; if(FRAME_MBAFF){ |