avcodec/error_resilience check error_concealment, not err_recognition.

err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/43/head
Anton Khirnov 11 years ago committed by Michael Niedermayer
parent 4e268285aa
commit 346e09638c
  1. 6
      libavcodec/error_resilience.c

@ -753,7 +753,7 @@ static int is_intra_more_likely(ERContext *s)
void ff_er_frame_start(ERContext *s) void ff_er_frame_start(ERContext *s)
{ {
if (!s->avctx->err_recognition) if (!s->avctx->error_concealment)
return; return;
memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END, memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END,
@ -787,7 +787,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty,
return; return;
} }
if (!s->avctx->err_recognition) if (!s->avctx->error_concealment)
return; return;
mask &= ~VP_START; mask &= ~VP_START;
@ -851,7 +851,7 @@ void ff_er_frame_end(ERContext *s)
/* We do not support ER of field pictures yet, /* We do not support ER of field pictures yet,
* though it should not crash if enabled. */ * 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->lowres || s->avctx->lowres ||
s->avctx->hwaccel || s->avctx->hwaccel ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU || s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||

Loading…
Cancel
Save