# HG changeset patch
# User michaelni
# Date 1049938793 0
# Node ID d2fd27d01df8cd836f8b36fdf51d9c74af336c45
# Parent  2de2a847af67fe2587c30a05bbcba70b2b3dd328
fixing slice decoding, dunno why the regression tests didnt catch that ...

diff -r 2de2a847af67 -r d2fd27d01df8 error_resilience.c
--- a/error_resilience.c	Mon Apr 07 19:23:21 2003 +0000
+++ b/error_resilience.c	Thu Apr 10 01:39:53 2003 +0000
@@ -614,13 +614,13 @@
             s->error_status_table[i] &= mask;
         }
     }
-
-    s->error_status_table[start_xy] |= VP_START;
-    
+   
     if(end_xy < s->mb_num){
         s->error_status_table[end_xy] &= mask;
         s->error_status_table[end_xy] |= status;
     }
+ 
+    s->error_status_table[start_xy] |= VP_START;
 }
 
 void ff_er_frame_end(MpegEncContext *s){
diff -r 2de2a847af67 -r d2fd27d01df8 h263dec.c
--- a/h263dec.c	Mon Apr 07 19:23:21 2003 +0000
+++ b/h263dec.c	Thu Apr 10 01:39:53 2003 +0000
@@ -484,7 +484,7 @@
     avctx->has_b_frames= !s->low_delay;
 
     if(s->workaround_bugs&FF_BUG_AUTODETECT){
-        if(s->padding_bug_score > -2 && !s->data_partitioning)
+        if(s->padding_bug_score > -2 && !s->data_partitioning && !s->resync_marker)
             s->workaround_bugs |=  FF_BUG_NO_PADDING;
         else
             s->workaround_bugs &= ~FF_BUG_NO_PADDING;