summaryrefslogtreecommitdiff
path: root/libavcodec/error_resilience.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-10-25 16:41:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-27 09:51:21 +0100
commit346e09638cc159a3c3e4cf971a5b795644faac16 (patch)
tree0de96393e10c07cdb2c7fee43f402600196d4e85 /libavcodec/error_resilience.c
parent4e268285aaff2fdd352eeac4765169a01e6eefe4 (diff)
downloadffmpeg-346e09638cc159a3c3e4cf971a5b795644faac16.tar.gz
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>
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r--libavcodec/error_resilience.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index b9924a6dcc..23180dc273 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -753,7 +753,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,
@@ -787,7 +787,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;
@@ -851,7 +851,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->lowres ||
s->avctx->hwaccel ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||