From 0d90aec0fd7428a77b5c4c536ab65635669bc42d Mon Sep 17 00:00:00 2001
From: Mike Melanson <mike@multimedia.cx>
Date: Sun, 14 Mar 2004 21:14:07 +0000
Subject: sync to ffmpeg build 4707

CVS patchset: 6253
CVS date: 2004/03/14 21:14:07
---
 src/libffmpeg/libavcodec/error_resilience.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libffmpeg/libavcodec/error_resilience.c')

diff --git a/src/libffmpeg/libavcodec/error_resilience.c b/src/libffmpeg/libavcodec/error_resilience.c
index 5067a248f..c6b10a79c 100644
--- a/src/libffmpeg/libavcodec/error_resilience.c
+++ b/src/libffmpeg/libavcodec/error_resilience.c
@@ -652,7 +652,7 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en
  
     s->error_status_table[start_xy] |= VP_START;
 
-    if(start_xy > 0){
+    if(start_xy > 0 && s->avctx->thread_count <= 1){
         int prev_status= s->error_status_table[ s->mb_index2xy[start_i - 1] ];
         
         prev_status &= ~ VP_START;
-- 
cgit v1.2.3