changeset 751:cbe316f082bc libavcodec

warning fixes
author michaelni
date Tue, 15 Oct 2002 15:24:08 +0000
parents 4adadf210b3b
children 97077dd24bfa
files dsputil.c h263.c mpeg12.c
diffstat 3 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/dsputil.c	Mon Oct 14 19:53:04 2002 +0000
+++ b/dsputil.c	Tue Oct 15 15:24:08 2002 +0000
@@ -1512,7 +1512,7 @@
 
 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++) {
--- a/h263.c	Mon Oct 14 19:53:04 2002 +0000
+++ b/h263.c	Tue Oct 15 15:24:08 2002 +0000
@@ -1860,8 +1860,10 @@
 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 @@
 
         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 
--- a/mpeg12.c	Mon Oct 14 19:53:04 2002 +0000
+++ b/mpeg12.c	Tue Oct 15 15:24:08 2002 +0000
@@ -698,7 +698,7 @@
 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);