# HG changeset patch
# User kabi
# Date 1044869732 0
# Node ID bb5de8a59da821fe7639d57e7d897f39ea99a4f1
# Parent  eb403f8158eb0448c9b43bcb41c31cff87927fa1
* static,const,compiler warning cleanup

diff -r eb403f8158eb -r bb5de8a59da8 ac3enc.c
--- a/ac3enc.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/ac3enc.c	Mon Feb 10 09:35:32 2003 +0000
@@ -28,18 +28,18 @@
     int nb_all_channels;
     int lfe_channel;
     int bit_rate;
-    int sample_rate;
-    int bsid;
-    int frame_size_min; /* minimum frame size in case rounding is necessary */
-    int frame_size; /* current frame size in words */
+    unsigned int sample_rate;
+    unsigned int bsid;
+    unsigned int frame_size_min; /* minimum frame size in case rounding is necessary */
+    unsigned int frame_size; /* current frame size in words */
     int halfratecod;
-    int frmsizecod;
-    int fscod; /* frequency */
-    int acmod;
+    unsigned int frmsizecod;
+    unsigned int fscod; /* frequency */
+    unsigned int acmod;
     int lfe;
-    int bsmod;
+    unsigned int bsmod;
     short last_samples[AC3_MAX_CHANNELS][256];
-    int chbwcod[AC3_MAX_CHANNELS];
+    unsigned int chbwcod[AC3_MAX_CHANNELS];
     int nb_coefs[AC3_MAX_CHANNELS];
     
     /* bitrate allocation control */
@@ -586,7 +586,7 @@
 }
 
 /* return the size in bits taken by the mantissa */
-int compute_mantissa_size(AC3EncodeContext *s, UINT8 *m, int nb_coefs)
+static int compute_mantissa_size(AC3EncodeContext *s, UINT8 *m, int nb_coefs)
 {
     int bits, mant, i;
 
diff -r eb403f8158eb -r bb5de8a59da8 common.c
--- a/common.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/common.c	Mon Feb 10 09:35:32 2003 +0000
@@ -160,16 +160,16 @@
 
 #define GET_DATA(v, table, i, wrap, size) \
 {\
-    const UINT8 *ptr = (UINT8 *)table + i * wrap;\
+    const UINT8 *ptr = (const UINT8 *)table + i * wrap;\
     switch(size) {\
     case 1:\
-        v = *(UINT8 *)ptr;\
+        v = *(const UINT8 *)ptr;\
         break;\
     case 2:\
-        v = *(UINT16 *)ptr;\
+        v = *(const UINT16 *)ptr;\
         break;\
     default:\
-        v = *(UINT32 *)ptr;\
+        v = *(const UINT32 *)ptr;\
         break;\
     }\
 }
diff -r eb403f8158eb -r bb5de8a59da8 eval.c
--- a/eval.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/eval.c	Mon Feb 10 09:35:32 2003 +0000
@@ -23,6 +23,9 @@
  * see http://joe.hotchkiss.com/programming/eval/eval.html
  */
 
+#include "avcodec.h"
+#include "mpegvideo.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -43,9 +46,9 @@
     int stack_index;
     char *s;
     double *const_value;
-    char **const_name;          // NULL terminated
+    const char **const_name;          // NULL terminated
     double (**func1)(void *, double a); // NULL terminated
-    char **func1_name;          // NULL terminated
+    const char **func1_name;          // NULL terminated
     double (**func2)(void *, double a, double b); // NULL terminated
     char **func2_name;          // NULL terminated
     void *opaque;
@@ -71,7 +74,7 @@
     return p->stack[ --p->stack_index ];
 }
 
-static int strmatch(char *s, char *prefix){
+static int strmatch(const char *s, const char *prefix){
     int i;
     for(i=0; prefix[i]; i++){
         if(prefix[i] != s[i]) return 0;
@@ -126,7 +129,7 @@
     else if( strmatch(next, "log"   ) ) d= log(d);
     else if( strmatch(next, "squish") ) d= 1/(1+exp(4*d));
     else if( strmatch(next, "gauss" ) ) d= exp(-d*d/2)/sqrt(2*M_PI);
-    else if( strmatch(next, "abs"   ) ) d= abs(d);
+    else if( strmatch(next, "abs"   ) ) d= fabs(d);
     else if( strmatch(next, "max"   ) ) d= d > d2 ? d : d2;
     else if( strmatch(next, "min"   ) ) d= d < d2 ? d : d2;
     else if( strmatch(next, "gt"    ) ) d= d > d2 ? 1.0 : 0.0;
@@ -228,8 +231,8 @@
     }
 }
 
-double ff_eval(char *s, double *const_value, char **const_name,
-               double (**func1)(void *, double), char **func1_name, 
+double ff_eval(char *s, double *const_value, const char **const_name,
+               double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), char **func2_name,
                void *opaque){
     Parser p;
diff -r eb403f8158eb -r bb5de8a59da8 h263.c
--- a/h263.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/h263.c	Mon Feb 10 09:35:32 2003 +0000
@@ -456,7 +456,7 @@
 		    DCTELEM block[6][64],
 		    int motion_x, int motion_y)
 {
-    int cbpc, cbpy, i, pred_x, pred_y;
+    int cbpc, cbpy, pred_x, pred_y;
     int bits;
     PutBitContext * const pb2    = s->data_partitioning                         ? &s->pb2    : &s->pb;
     PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=B_TYPE ? &s->tex_pb : &s->pb;
@@ -467,7 +467,7 @@
     //    printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
     if (!s->mb_intra) {
         /* compute cbp */
-        int cbp = 0;
+        int i, cbp = 0;
         for (i = 0; i < 6; i++) {
             if (s->block_last_index[i] >= 0)
                 cbp |= 1 << (5 - i);
@@ -728,7 +728,8 @@
         int dc_diff[6];   //dc values with the dc prediction subtracted 
         int dir[6];  //prediction direction
         int zigzag_last_index[6];
-        UINT8 *scan_table[6];
+	UINT8 *scan_table[6];
+        int i;
 
         for(i=0; i<6; i++){
             const int level= block[i][0];
@@ -1010,7 +1011,7 @@
 }
 
 
-void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)
+static void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)
 {
     int x, y, wrap, a, c, pred_dc, scale, i;
     INT16 *dc_val, *ac_val, *ac_val1;
@@ -4353,7 +4354,7 @@
         // FIXME a bunch of grayscale shape things
 
         if((s->mpeg_quant=get_bits1(gb))){ /* vol_quant_type */
-            int i, j, v;
+            int i, v;
             
             /* load default matrixes */
             for(i=0; i<64; i++){
@@ -4370,7 +4371,8 @@
             /* load custom intra matrix */
             if(get_bits1(gb)){
                 int last=0;
-                for(i=0; i<64; i++){
+		for(i=0; i<64; i++){
+                    int j;
                     v= get_bits(gb, 8);
                     if(v==0) break;
                     
@@ -4382,7 +4384,7 @@
 
                 /* replicate last value */
                 for(; i<64; i++){
-                    j= s->idct_permutation[ ff_zigzag_direct[i] ];
+		    int j= s->idct_permutation[ ff_zigzag_direct[i] ];
                     s->intra_matrix[j]= v;
                     s->chroma_intra_matrix[j]= v;
                 }
@@ -4391,7 +4393,8 @@
             /* load custom non intra matrix */
             if(get_bits1(gb)){
                 int last=0;
-                for(i=0; i<64; i++){
+		for(i=0; i<64; i++){
+                    int j;
                     v= get_bits(gb, 8);
                     if(v==0) break;
 
@@ -4403,7 +4406,7 @@
 
                 /* replicate last value */
                 for(; i<64; i++){
-                    j= s->idct_permutation[ ff_zigzag_direct[i] ];
+		    int j= s->idct_permutation[ ff_zigzag_direct[i] ];
                     s->inter_matrix[j]= last;
                     s->chroma_inter_matrix[j]= last;
                 }
diff -r eb403f8158eb -r bb5de8a59da8 i386/dsputil_mmx.c
--- a/i386/dsputil_mmx.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/i386/dsputil_mmx.c	Mon Feb 10 09:35:32 2003 +0000
@@ -23,30 +23,7 @@
 
 int mm_flags; /* multimedia extension flags */
 /* FIXME use them in static form */
-int pix_abs16x16_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs16x16_x2_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs16x16_y2_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs16x16_xy2_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-
-int pix_abs16x16_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs16x16_x2_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs16x16_y2_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs16x16_xy2_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-
-int pix_abs8x8_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs8x8_x2_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs8x8_y2_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs8x8_xy2_mmx(UINT8 *blk1, UINT8 *blk2, int lx);
-
-int pix_abs8x8_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs8x8_x2_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs8x8_y2_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-int pix_abs8x8_xy2_mmx2(UINT8 *blk1, UINT8 *blk2, int lx);
-
-int sad16x16_mmx(void *s, UINT8 *blk1, UINT8 *blk2, int lx);
-int sad8x8_mmx(void *s, UINT8 *blk1, UINT8 *blk2, int lx);
-int sad16x16_mmx2(void *s, UINT8 *blk1, UINT8 *blk2, int lx);
-int sad8x8_mmx2(void *s, UINT8 *blk1, UINT8 *blk2, int lx);
+void dsputil_init_pix_mmx(DSPContext* c, unsigned mask);
 
 /* pixel operations */
 static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
@@ -777,7 +754,7 @@
         OP(%%mm5, out, %%mm7, d)
 
 #define QPEL_BASE(OPNAME, ROUNDER, RND, OP_MMX2, OP_3DNOW)\
-void OPNAME ## mpeg4_qpel16_h_lowpass_mmx2(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
+static void OPNAME ## mpeg4_qpel16_h_lowpass_mmx2(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
     uint64_t temp;\
 \
     asm volatile(\
@@ -944,7 +921,7 @@
     }\
 }\
 \
-void OPNAME ## mpeg4_qpel8_h_lowpass_mmx2(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
+static void OPNAME ## mpeg4_qpel8_h_lowpass_mmx2(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){\
     uint64_t temp;\
 \
     asm volatile(\
@@ -1121,7 +1098,7 @@
     );\
 }\
 \
-void OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
+static void OPNAME ## mpeg4_qpel8_v_lowpass_ ## MMX(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
     uint64_t temp[9*4];\
     uint64_t *temp_ptr= temp;\
     int count= 9;\
@@ -1460,15 +1437,6 @@
         c->clear_blocks = clear_blocks_mmx;
         c->pix_sum = pix_sum16_mmx;
 
-        c->pix_abs16x16     = pix_abs16x16_mmx;
-        c->pix_abs16x16_x2  = pix_abs16x16_x2_mmx;
-        c->pix_abs16x16_y2  = pix_abs16x16_y2_mmx;
-        c->pix_abs16x16_xy2 = pix_abs16x16_xy2_mmx;
-        c->pix_abs8x8     = pix_abs8x8_mmx;
-        c->pix_abs8x8_x2  = pix_abs8x8_x2_mmx;
-        c->pix_abs8x8_y2  = pix_abs8x8_y2_mmx;
-        c->pix_abs8x8_xy2 = pix_abs8x8_xy2_mmx;
-
         c->put_pixels_tab[0][0] = put_pixels16_mmx;
         c->put_pixels_tab[0][1] = put_pixels16_x2_mmx;
         c->put_pixels_tab[0][2] = put_pixels16_y2_mmx;
@@ -1515,26 +1483,10 @@
         c->hadamard8_diff[0]= hadamard8_diff16_mmx;
         c->hadamard8_diff[1]= hadamard8_diff_mmx;
         
-        c->sad[0]= sad16x16_mmx;
-        c->sad[1]= sad8x8_mmx;
-
 	c->pix_norm1 = pix_norm1_mmx;
 	c->sse[0] = sse16_mmx;
         
         if (mm_flags & MM_MMXEXT) {
-            c->pix_abs16x16     = pix_abs16x16_mmx2;
-            c->pix_abs16x16_x2  = pix_abs16x16_x2_mmx2;
-            c->pix_abs16x16_y2  = pix_abs16x16_y2_mmx2;
-            c->pix_abs16x16_xy2 = pix_abs16x16_xy2_mmx2;
-
-            c->pix_abs8x8     = pix_abs8x8_mmx2;
-            c->pix_abs8x8_x2  = pix_abs8x8_x2_mmx2;
-            c->pix_abs8x8_y2  = pix_abs8x8_y2_mmx2;
-            c->pix_abs8x8_xy2 = pix_abs8x8_xy2_mmx2;
-
-            c->sad[0]= sad16x16_mmx2;
-            c->sad[1]= sad8x8_mmx2;
-            
             c->put_pixels_tab[0][1] = put_pixels16_x2_mmx2;
             c->put_pixels_tab[0][2] = put_pixels16_y2_mmx2;
             c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_mmx2;
@@ -1644,7 +1596,7 @@
             SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_3dnow)
         }
     }
-
+    dsputil_init_pix_mmx(c, mask);
 #if 0
     // for speed testing
     get_pixels = just_return;
@@ -1694,14 +1646,6 @@
         c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_mmx;
         c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_mmx;
         c->avg_pixels_tab[1][3] = avg_pixels8_xy2_mmx;
-
-        if (mm_flags & MM_MMXEXT) {
-            c->pix_abs16x16_x2  = pix_abs16x16_x2_mmx;
-            c->pix_abs16x16_y2  = pix_abs16x16_y2_mmx;
-            c->pix_abs16x16_xy2 = pix_abs16x16_xy2_mmx;
-            c->pix_abs8x8_x2 = pix_abs8x8_x2_mmx;
-            c->pix_abs8x8_y2 = pix_abs8x8_y2_mmx;
-            c->pix_abs8x8_xy2= pix_abs8x8_xy2_mmx;
-        }
     }
+    dsputil_set_bit_exact_pix_mmx(c, mask);
 }
diff -r eb403f8158eb -r bb5de8a59da8 i386/motion_est_mmx.c
--- a/i386/motion_est_mmx.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/i386/motion_est_mmx.c	Mon Feb 10 09:35:32 2003 +0000
@@ -20,6 +20,9 @@
  */
 #include "../dsputil.h"
 
+void dsputil_init_pix_mmx(DSPContext* c, unsigned mask);
+void dsputil_set_bit_exact_pix_mmx(DSPContext* c, unsigned mask);
+
 static const __attribute__ ((aligned(8))) UINT64 round_tab[3]={
 0x0000000000000000,
 0x0001000100010001,
@@ -118,7 +121,7 @@
     asm volatile(
         ".balign 16			\n\t"
         "movq "MANGLE(bone)", %%mm5	\n\t"
-        "1:				\n\t" 
+        "1:				\n\t"
         "movq (%1, %%eax), %%mm0	\n\t"
         "movq (%2, %%eax), %%mm2	\n\t"
         "movq 1(%1, %%eax), %%mm1	\n\t"
@@ -165,7 +168,7 @@
         "punpckhbw %%mm7, %%mm3		\n\t"
         "paddw %%mm0, %%mm1		\n\t"
         "paddw %%mm2, %%mm3		\n\t"
-        "movq (%3, %%eax), %%mm4	\n\t" 
+        "movq (%3, %%eax), %%mm4	\n\t"
         "movq (%3, %%eax), %%mm2	\n\t"
         "paddw %%mm5, %%mm1		\n\t"
         "paddw %%mm5, %%mm3		\n\t"
@@ -215,8 +218,8 @@
         "punpckhbw %%mm7, %%mm4		\n\t"
         "paddw %%mm3, %%mm2		\n\t"
         "paddw %%mm4, %%mm1		\n\t"
-        "movq (%3, %%eax), %%mm3	\n\t" 
-        "movq (%3, %%eax), %%mm4	\n\t" 
+        "movq (%3, %%eax), %%mm3	\n\t"
+        "movq (%3, %%eax), %%mm4	\n\t"
         "paddw %%mm5, %%mm2		\n\t"
         "paddw %%mm5, %%mm1		\n\t"
         "psrlw $2, %%mm2		\n\t"
@@ -237,7 +240,7 @@
     );
 }
 
-static inline int sum_mmx()
+static inline int sum_mmx(void)
 {
     int ret;
     asm volatile(
@@ -253,7 +256,7 @@
     return ret&0xFFFF;
 }
 
-static inline int sum_mmx2()
+static inline int sum_mmx2(void)
 {
     int ret;
     asm volatile(
@@ -265,7 +268,7 @@
 
 
 #define PIX_SAD(suf)\
-int pix_abs8x8_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs8x8_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t":);\
@@ -274,7 +277,7 @@
 \
     return sum_ ## suf();\
 }\
-int sad8x8_ ## suf(void *s, UINT8 *blk2, UINT8 *blk1, int stride)\
+static int sad8x8_ ## suf(void *s, UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t":);\
@@ -284,7 +287,7 @@
     return sum_ ## suf();\
 }\
 \
-int pix_abs8x8_x2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs8x8_x2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t"\
@@ -297,7 +300,7 @@
     return sum_ ## suf();\
 }\
 \
-int pix_abs8x8_y2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs8x8_y2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t"\
@@ -310,7 +313,7 @@
     return sum_ ## suf();\
 }\
 \
-int pix_abs8x8_xy2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs8x8_xy2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t"\
@@ -323,7 +326,7 @@
     return sum_ ## suf();\
 }\
 \
-int pix_abs16x16_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs16x16_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t":);\
@@ -333,7 +336,7 @@
 \
     return sum_ ## suf();\
 }\
-int sad16x16_ ## suf(void *s, UINT8 *blk2, UINT8 *blk1, int stride)\
+static int sad16x16_ ## suf(void *s, UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t":);\
@@ -343,7 +346,7 @@
 \
     return sum_ ## suf();\
 }\
-int pix_abs16x16_x2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs16x16_x2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t"\
@@ -356,7 +359,7 @@
 \
     return sum_ ## suf();\
 }\
-int pix_abs16x16_y2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs16x16_y2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t"\
@@ -369,7 +372,7 @@
 \
     return sum_ ## suf();\
 }\
-int pix_abs16x16_xy2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
+static int pix_abs16x16_xy2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
     asm volatile("pxor %%mm7, %%mm7		\n\t"\
                  "pxor %%mm6, %%mm6		\n\t"\
@@ -385,3 +388,45 @@
 
 PIX_SAD(mmx)
 PIX_SAD(mmx2)
+
+void dsputil_init_pix_mmx(DSPContext* c, unsigned mask)
+{
+    if (mm_flags & MM_MMX) {
+        c->pix_abs16x16     = pix_abs16x16_mmx;
+        c->pix_abs16x16_x2  = pix_abs16x16_x2_mmx;
+        c->pix_abs16x16_y2  = pix_abs16x16_y2_mmx;
+        c->pix_abs16x16_xy2 = pix_abs16x16_xy2_mmx;
+        c->pix_abs8x8     = pix_abs8x8_mmx;
+        c->pix_abs8x8_x2  = pix_abs8x8_x2_mmx;
+        c->pix_abs8x8_y2  = pix_abs8x8_y2_mmx;
+        c->pix_abs8x8_xy2 = pix_abs8x8_xy2_mmx;
+
+	c->sad[0]= sad16x16_mmx;
+        c->sad[1]= sad8x8_mmx;
+    }
+    if (mm_flags & MM_MMXEXT) {
+	c->pix_abs16x16     = pix_abs16x16_mmx2;
+	c->pix_abs16x16_x2  = pix_abs16x16_x2_mmx2;
+	c->pix_abs16x16_y2  = pix_abs16x16_y2_mmx2;
+	c->pix_abs16x16_xy2 = pix_abs16x16_xy2_mmx2;
+	c->pix_abs8x8     = pix_abs8x8_mmx2;
+	c->pix_abs8x8_x2  = pix_abs8x8_x2_mmx2;
+	c->pix_abs8x8_y2  = pix_abs8x8_y2_mmx2;
+	c->pix_abs8x8_xy2 = pix_abs8x8_xy2_mmx2;
+
+	c->sad[0]= sad16x16_mmx2;
+	c->sad[1]= sad8x8_mmx2;
+    }
+}
+
+void dsputil_set_bit_exact_pix_mmx(DSPContext* c, unsigned mask)
+{
+    if (mm_flags & MM_MMXEXT) {
+	c->pix_abs16x16_x2  = pix_abs16x16_x2_mmx;
+	c->pix_abs16x16_y2  = pix_abs16x16_y2_mmx;
+	c->pix_abs16x16_xy2 = pix_abs16x16_xy2_mmx;
+	c->pix_abs8x8_x2  = pix_abs8x8_x2_mmx;
+	c->pix_abs8x8_y2  = pix_abs8x8_y2_mmx;
+	c->pix_abs8x8_xy2 = pix_abs8x8_xy2_mmx;
+    }
+}
diff -r eb403f8158eb -r bb5de8a59da8 imgconvert.c
--- a/imgconvert.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/imgconvert.c	Mon Feb 10 09:35:32 2003 +0000
@@ -739,7 +739,7 @@
 
 #define RGB_IN(r, g, b, s)\
 {\
-    unsigned int v = ((UINT16 *)(s))[0];\
+    unsigned int v = ((const UINT16 *)(s))[0];\
     r = bitcopy_n(v >> (10 - 3), 3);\
     g = bitcopy_n(v >> (5 - 3), 3);\
     b = bitcopy_n(v << 3, 3);\
@@ -762,7 +762,7 @@
 
 #define RGB_IN(r, g, b, s)\
 {\
-    unsigned int v = ((UINT16 *)(s))[0];\
+    unsigned int v = ((const UINT16 *)(s))[0];\
     r = bitcopy_n(v >> (11 - 3), 3);\
     g = bitcopy_n(v >> (5 - 2), 2);\
     b = bitcopy_n(v << 3, 3);\
@@ -833,7 +833,7 @@
 
 #define RGB_IN(r, g, b, s)\
 {\
-    unsigned int v = ((UINT32 *)(s))[0];\
+    unsigned int v = ((const UINT32 *)(s))[0];\
     r = (v >> 16) & 0xff;\
     g = (v >> 8) & 0xff;\
     b = v & 0xff;\
@@ -1229,7 +1229,7 @@
 static int avpicture_alloc(AVPicture *picture,
                            int pix_fmt, int width, int height)
 {
-    int size;
+    unsigned int size;
     void *ptr;
 
     size = avpicture_get_size(pix_fmt, width, height);
diff -r eb403f8158eb -r bb5de8a59da8 imgresample.c
--- a/imgresample.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/imgresample.c	Mon Feb 10 09:35:32 2003 +0000
@@ -22,7 +22,6 @@
 #ifdef USE_FASTMEMCPY
 #include "fastmemcpy.h"
 #endif
-extern int mm_flags;
 
 #define NB_COMPONENTS 3
 
diff -r eb403f8158eb -r bb5de8a59da8 mjpeg.c
--- a/mjpeg.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/mjpeg.c	Mon Feb 10 09:35:32 2003 +0000
@@ -1262,11 +1262,11 @@
 
 static int mjpeg_decode_com(MJpegDecodeContext *s)
 {
-    int len, i;
+    int i;
     UINT8 *cbuf;
 
     /* XXX: verify len field validity */
-    len = get_bits(&s->gb, 16)-2;
+    unsigned int len = get_bits(&s->gb, 16)-2;
     cbuf = av_malloc(len+1);
 
     for (i = 0; i < len; i++)
diff -r eb403f8158eb -r bb5de8a59da8 motion_est.c
--- a/motion_est.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/motion_est.c	Mon Feb 10 09:35:32 2003 +0000
@@ -61,8 +61,8 @@
 }Minima;
 
 static int minima_cmp(const void *a, const void *b){
-    Minima *da = (Minima *) a;
-    Minima *db = (Minima *) b;
+    const Minima *da = (const Minima *) a;
+    const Minima *db = (const Minima *) b;
     
     return da->height - db->height;
 }
@@ -1193,7 +1193,7 @@
     return dmin;
 }
 
-int ff_estimate_motion_b(MpegEncContext * s,
+static int ff_estimate_motion_b(MpegEncContext * s,
                        int mb_x, int mb_y, int16_t (*mv_table)[2], Picture *picture, int f_code)
 {
     int mx, my, range, dmin;
diff -r eb403f8158eb -r bb5de8a59da8 mpegaudio.c
--- a/mpegaudio.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/mpegaudio.c	Mon Feb 10 09:35:32 2003 +0000
@@ -54,7 +54,7 @@
 
 #include "mpegaudiotab.h"
 
-int MPA_encode_init(AVCodecContext *avctx)
+static int MPA_encode_init(AVCodecContext *avctx)
 {
     MpegAudioContext *s = avctx->priv_data;
     int freq = avctx->sample_rate;
@@ -737,8 +737,8 @@
     flush_put_bits(p);
 }
 
-int MPA_encode_frame(AVCodecContext *avctx,
-                     unsigned char *frame, int buf_size, void *data)
+static int MPA_encode_frame(AVCodecContext *avctx,
+			    unsigned char *frame, int buf_size, void *data)
 {
     MpegAudioContext *s = avctx->priv_data;
     short *samples = data;
diff -r eb403f8158eb -r bb5de8a59da8 mpegaudiodec.c
--- a/mpegaudiodec.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/mpegaudiodec.c	Mon Feb 10 09:35:32 2003 +0000
@@ -348,7 +348,8 @@
         huff_code_table[0] = NULL;
         for(i=1;i<16;i++) {
             const HuffTable *h = &mpa_huff_tables[i];
-            int xsize, n, x, y;
+	    int xsize, x, y;
+            unsigned int n;
             UINT8 *code_table;
 
             xsize = h->xsize;
@@ -1448,7 +1449,7 @@
 /*
  * Seek back in the stream for backstep bytes (at most 511 bytes)
  */
-static void seek_to_maindata(MPADecodeContext *s, long backstep)
+static void seek_to_maindata(MPADecodeContext *s, unsigned int backstep)
 {
     UINT8 *ptr;
 
diff -r eb403f8158eb -r bb5de8a59da8 mpegvideo.h
--- a/mpegvideo.h	Sun Feb 09 16:58:47 2003 +0000
+++ b/mpegvideo.h	Mon Feb 10 09:35:32 2003 +0000
@@ -20,6 +20,8 @@
 #ifndef AVCODEC_MPEGVIDEO_H
 #define AVCODEC_MPEGVIDEO_H
 
+#include "dsputil.h"
+
 #define FRAME_SKIPED 100 // return value for header parsers if frame is not coded
 
 enum OutputFormat {
@@ -771,8 +773,8 @@
 float ff_rate_estimate_qscale(MpegEncContext *s);
 void ff_write_pass1_stats(MpegEncContext *s);
 void ff_rate_control_uninit(MpegEncContext *s);
-double ff_eval(char *s, double *const_value, char **const_name,
-               double (**func1)(void *, double), char **func1_name, 
+double ff_eval(char *s, double *const_value, const char **const_name,
+               double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), char **func2_name,
                void *opaque);
 
diff -r eb403f8158eb -r bb5de8a59da8 msmpeg4.c
--- a/msmpeg4.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/msmpeg4.c	Mon Feb 10 09:35:32 2003 +0000
@@ -625,7 +625,7 @@
 }
 
 /* old ffmpeg msmpeg4v3 mode */
-void ff_old_msmpeg4_dc_scale(MpegEncContext * s)
+static void ff_old_msmpeg4_dc_scale(MpegEncContext * s)
 {
     if (s->qscale < 5){
         s->y_dc_scale = 8;
diff -r eb403f8158eb -r bb5de8a59da8 ratecontrol.c
--- a/ratecontrol.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/ratecontrol.c	Mon Feb 10 09:35:32 2003 +0000
@@ -250,7 +250,7 @@
         (rcc->i_cplx_sum[pict_type] + rcc->p_cplx_sum[pict_type]) / (double)rcc->frame_count[pict_type],
         0
     };
-    char *const_names[]={
+    static const char *const_names[]={
         "PI",
         "E",
         "iTex",
@@ -282,7 +282,7 @@
         (void *)qp2bits,
         NULL
     };
-    char *func1_names[]={
+    static const char *func1_names[]={
         "bits2qp",
         "qp2bits",
         NULL
diff -r eb403f8158eb -r bb5de8a59da8 resample.c
--- a/resample.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/resample.c	Mon Feb 10 09:35:32 2003 +0000
@@ -43,7 +43,7 @@
 static void init_mono_resample(ReSampleChannelContext *s, float ratio)
 {
     ratio = 1.0 / ratio;
-    s->iratio = (int)floor(ratio);
+    s->iratio = (int)floorf(ratio);
     if (s->iratio == 0)
         s->iratio = 1;
     s->incr = (int)((ratio / s->iratio) * FRAC);
diff -r eb403f8158eb -r bb5de8a59da8 utils.c
--- a/utils.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/utils.c	Mon Feb 10 09:35:32 2003 +0000
@@ -46,7 +46,7 @@
 /**
  * realloc which does nothing if the block is large enough
  */
-void *av_fast_realloc(void *ptr, int *size, int min_size)
+void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size)
 {
     if(min_size < *size) 
         return ptr;
@@ -63,7 +63,7 @@
 static const unsigned int grow_static = 64; // ^2
 void *__av_mallocz_static(void** location, unsigned int size)
 {
-    int l = (last_static + grow_static) & ~(grow_static - 1);
+    unsigned int l = (last_static + grow_static) & ~(grow_static - 1);
     void *ptr = av_mallocz(size);
     if (!ptr)
 	return NULL;
diff -r eb403f8158eb -r bb5de8a59da8 wmv2.c
--- a/wmv2.c	Sun Feb 09 16:58:47 2003 +0000
+++ b/wmv2.c	Mon Feb 10 09:35:32 2003 +0000
@@ -467,7 +467,7 @@
     return 0;
 }
 
-void ff_wmv2_decode_init(MpegEncContext *s){
+static void ff_wmv2_decode_init(MpegEncContext *s){
 }
 
 static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){