diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 16:49:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 16:49:35 +0100 |
| commit | 90539cea336fd513c47295a03c164cb4a851166f (patch) | |
| tree | 1292de9b78ca2db8ef78258b6e71b0112f44e338 /libavcodec | |
| parent | afb18c55783362546b5e512ce01b7fe7bf5744d9 (diff) | |
| download | ffmpeg-90539cea336fd513c47295a03c164cb4a851166f.tar.gz | |
avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice
Fixes incorrectly set error_occured and improves speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/error_resilience.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 4e3fdbd502..8e3fb616be 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -845,7 +845,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, s->error_status_table[start_xy] |= VP_START; if (start_xy > 0 && !(s->avctx->active_thread_type & FF_THREAD_SLICE) && - s->avctx->skip_top * s->mb_width < start_i) { + er_supported(s) && s->avctx->skip_top * s->mb_width < start_i) { int prev_status = s->error_status_table[s->mb_index2xy[start_i - 1]]; prev_status &= ~ VP_START; |