[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h263.c,1.305,1.306

[Richard Felker CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv17344/libavcodec

Modified Files:
	h263.c 
Log Message:
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)

Index: h263.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- h263.c	3 Apr 2006 07:52:23 -0000	1.305
+++ h263.c	9 Apr 2006 06:04:00 -0000	1.306
@@ -553,11 +553,10 @@
 
 #endif //CONFIG_ENCODERS
 
+#define tab_size (sizeof(s->direct_scale_mv[0])/sizeof(int16_t))
+#define tab_bias (tab_size/2)
+
 static void ff_mpeg4_init_direct_mv(MpegEncContext *s){
-    //FIXME table is stored in MpegEncContext for thread-safety,
-    // but a static array would be faster
-    static const int tab_size = sizeof(s->direct_scale_mv[0])/sizeof(int16_t);
-    static const int tab_bias = (tab_size/2);
     int i;
     for(i=0; i<tab_size; i++){
         s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
@@ -566,8 +565,6 @@
 }
 
 static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
-    static const int tab_size = sizeof(s->direct_scale_mv[0])/sizeof(int16_t);
-    static const int tab_bias = (tab_size/2);
     int xy= s->block_index[i];
     uint16_t time_pp= s->pp_time;
     uint16_t time_pb= s->pb_time;
@@ -595,6 +592,9 @@
     }
 }
 
+#undef tab_size
+#undef tab_bias
+
 /**
  *
  * @return the mb_type