diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-25 07:19:27 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-28 07:22:11 +0100 |
| commit | f354f30836a3148275ce60d19bbc581310249ad2 (patch) | |
| tree | a7a36684a69862757b2464dc8162bb34036aa5a6 /libavcodec/error_resilience.c | |
| parent | 53151723e377b9c43f876e20d7f27a17993256c8 (diff) | |
| download | ffmpeg-f354f30836a3148275ce60d19bbc581310249ad2.tar.gz | |
error resilience: check error_concealment, not err_recognition.
err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index a07787a3ae..1769d2b839 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -726,7 +726,7 @@ static int is_intra_more_likely(ERContext *s) void ff_er_frame_start(ERContext *s) { - if (!s->avctx->err_recognition) + if (!s->avctx->error_concealment) return; memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END, @@ -760,7 +760,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, return; } - if (!s->avctx->err_recognition) + if (!s->avctx->error_concealment) return; mask &= ~VP_START; @@ -822,7 +822,7 @@ void ff_er_frame_end(ERContext *s) /* We do not support ER of field pictures yet, * though it should not crash if enabled. */ - if (!s->avctx->err_recognition || s->error_count == 0 || + if (!s->avctx->error_concealment || s->error_count == 0 || s->avctx->hwaccel || !s->cur_pic || s->cur_pic->field_picture || s->error_count == 3 * s->mb_width * |