er: Fix slice threading check
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 18:58:14 +0000 (19:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Mar 2013 13:28:20 +0000 (14:28 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/error_resilience.c

index d5fbcbd..70a800a 100644 (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]];