Browse Source

er: Fix slice threading check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.2
Michael Niedermayer 13 years ago
parent
commit
5167bb2e8e
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/error_resilience.c

+ 1
- 1
libavcodec/error_resilience.c View File

@@ -827,7 +827,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->thread_count <= 1 &&
if (start_xy > 0 && !(s->avctx->active_thread_type & FF_THREAD_SLICE) &&
s->avctx->skip_top * s->mb_width < start_i) {
int prev_status = s->error_status_table[s->mb_index2xy[start_i - 1]];



Loading…
Cancel
Save