[SCM] libav/experimental: warning fixes

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d2975f8d4ff826b1f0477b48782927e5439896f8
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Oct 15 15:24:08 2002 +0000

    warning fixes
    
    Originally committed as revision 1044 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 1824330..75441f1 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -1512,7 +1512,7 @@ void clear_blocks_c(DCTELEM *blocks)
 
 void dsputil_init(void)
 {
-    int i, j;
+    int i;
 
     for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
     for(i=0;i<MAX_NEG_CROP;i++) {
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 77588b8..f23f1f5 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -1860,8 +1860,10 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, 
                                UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
 {
-    int last, i, last_non_zero, sign;
-    int code;
+    int i, last_non_zero;
+#if 0 //variables for the outcommented version
+    int code, sign, last;
+#endif
     const RLTable *rl;
     UINT32 *bits_tab;
     UINT8 *len_tab;
@@ -4250,13 +4252,20 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){
 
         if (s->scalability) {
             GetBitContext bak= *gb;
-            int dummy= s->hierachy_type= get_bits1(gb);
-            int ref_layer_id= get_bits(gb, 4);
-            int ref_layer_sampling_dir= get_bits1(gb);
-            int h_sampling_factor_n= get_bits(gb, 5);
-            int h_sampling_factor_m= get_bits(gb, 5);
-            int v_sampling_factor_n= get_bits(gb, 5);
-            int v_sampling_factor_m= get_bits(gb, 5);
+            int ref_layer_id;
+            int ref_layer_sampling_dir;
+            int h_sampling_factor_n;
+            int h_sampling_factor_m;
+            int v_sampling_factor_n;
+            int v_sampling_factor_m;
+            
+            s->hierachy_type= get_bits1(gb);
+            ref_layer_id= get_bits(gb, 4);
+            ref_layer_sampling_dir= get_bits1(gb);
+            h_sampling_factor_n= get_bits(gb, 5);
+            h_sampling_factor_m= get_bits(gb, 5);
+            v_sampling_factor_n= get_bits(gb, 5);
+            v_sampling_factor_m= get_bits(gb, 5);
             s->enhancement_type= get_bits1(gb);
             
             if(   h_sampling_factor_n==0 || h_sampling_factor_m==0 
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index cc81d89..84c4249 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -698,7 +698,7 @@ static inline int get_qscale(MpegEncContext *s)
 static int mpeg_decode_mb(MpegEncContext *s,
                           DCTELEM block[6][64])
 {
-    int i, j, k, cbp, val, code, mb_type, motion_type;
+    int i, j, k, cbp, val, mb_type, motion_type;
     
     dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
 

-- 
Libav/FFmpeg packaging