# HG changeset patch
# User michaelni
# Date 1026819914 0
# Node ID 23e58889a108646ae1ebdd784ae9f98184f9cd2f
# Parent  2d5ae7516af09577c80003690e6a5ae444f99bde
exporting mbskip_table after it has been allocated

diff -r 2d5ae7516af0 -r 23e58889a108 h263dec.c
--- a/h263dec.c	Tue Jul 16 10:29:07 2002 +0000
+++ b/h263dec.c	Tue Jul 16 11:45:14 2002 +0000
@@ -88,7 +88,6 @@
         return -1;
     }
     s->codec_id= avctx->codec->id;
-    avctx->mbskip_table= s->mbskip_table;
 
     /* for h263, we allocate the images after having read the header */
     if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)
diff -r 2d5ae7516af0 -r 23e58889a108 mpegvideo.c
--- a/mpegvideo.c	Tue Jul 16 10:29:07 2002 +0000
+++ b/mpegvideo.c	Tue Jul 16 11:45:14 2002 +0000
@@ -619,6 +619,7 @@
 
     s->mb_skiped = 0;
     s->decoding_error=0;
+    avctx->mbskip_table= s->mbskip_table;
 
     if(avctx->flags&CODEC_FLAG_DR1){
         int i;
@@ -628,6 +629,7 @@
         s->uvlinesize= avctx->dr_uvstride;
         s->ip_buffer_count= avctx->dr_ip_buffer_count;
     }
+    avctx->dr_ip_buffer_count= s->ip_buffer_count;
     
     if (s->pict_type == B_TYPE) {
         for(i=0;i<3;i++) {
@@ -1443,9 +1445,9 @@
             }
         }
 
-        dest_y = s->current_picture[0] + (mb_y * 16 * s->linesize) + mb_x * 16;
-        dest_cb = s->current_picture[1] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8;
-        dest_cr = s->current_picture[2] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8;
+        dest_y = s->current_picture [0] + (mb_y * 16* s->linesize  ) + mb_x * 16;
+        dest_cb = s->current_picture[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
+        dest_cr = s->current_picture[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
 
         if (s->interlaced_dct) {
             dct_linesize = s->linesize * 2;