videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-17 18:01:38 +02:00
Code Releases Activity

avcodec/error_resilience check error_concealment, not err_recognition.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2013-10-25 16:41:47 +02:00 committed by Michael Niedermayer
parent 4e268285aa
commit 346e09638c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/error_resilience.c
View File

@ -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 ||