warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)

Originally committed as revision 872 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c
index 390aa55..fceccf7 100644 (file)
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/i386/mpegvideo_mmx.c
@@ -195,7 +195,7 @@ static void dct_unquantize_mpeg1_mmx(MpegEncContext *s,
     const UINT16 *quant_matrix;
     
     if(s->alternate_scan) nCoeffs= 64;
-    else nCoeffs= nCoeffs= zigzag_end[ s->block_last_index[n] ];
+    else nCoeffs= zigzag_end[ s->block_last_index[n] ];
 
     if (s->mb_intra) {
         int block0;
@@ -321,7 +321,7 @@ static void dct_unquantize_mpeg2_mmx(MpegEncContext *s,
     const UINT16 *quant_matrix;
     
     if(s->alternate_scan) nCoeffs= 64;
-    else nCoeffs= nCoeffs= zigzag_end[ s->block_last_index[n] ];
+    else nCoeffs= zigzag_end[ s->block_last_index[n] ];
 
     if (s->mb_intra) {
         int block0;

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index d672642..2951638 100644 (file)
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1399,7 +1399,7 @@ static inline int direct_search(MpegEncContext * s,
     int mx, my, mx2, my2;
     uint8_t *ref_picture= s->me_scratchpad - (mb_x - 1 + (mb_y - 1)*s->linesize)*16;
     int16_t (*mv_table)[2]= s->b_direct_mv_table;
-    uint16_t *mv_penalty= s->mv_penalty[s->f_code] + MAX_MV; // f_code of the prev frame
+/*    uint16_t *mv_penalty= s->mv_penalty[s->f_code] + MAX_MV; */ // f_code of the prev frame
 
     /* thanks to iso-mpeg the rounding is different for the zero vector, so we need to handle that ... */
     motion_fx= (motion_px*time_pb)/time_pp;

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 94915ae..ba52a36 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -62,7 +62,7 @@ static UINT8 fcode_tab[MAX_MV*2+1];
 
 static void init_2d_vlc_rl(RLTable *rl)
 {
-    int i, q;
+    int i;
     
     init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2, 
              &rl->table_vlc[0][1], 4, 2,

diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index fc05cb5..fd55367 100644 (file)
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -279,7 +279,7 @@ static double get_qscale(MpegEncContext *s, RateControlEntry *rce, double rate_f
         "avgTex",
         NULL
     };
-    double (*func1[])(void *, double)={
+    static double (*func1[])(void *, double)={
         bits2qp,
         qp2bits,
         NULL