diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 16:49:35 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-12-07 11:34:42 +0100 |
| commit | 0639e403bed5aa5ae74d7de08934cfb8432d21fa (patch) | |
| tree | 861176afc1240efa5a4757be79206656e3f9cc9e | |
| parent | 5c7d6be5f9abcee0179796691b01859cbe7a4d31 (diff) | |
| download | ffmpeg-0639e403bed5aa5ae74d7de08934cfb8432d21fa.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>
(cherry picked from commit 90539cea336fd513c47295a03c164cb4a851166f)
| -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 77a9d26ce7..73f7f3b76f 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -839,7 +839,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; |