From b160941221f66f4da3c6ac24ba2398decd13e0e3 Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Tue, 9 Sep 2003 22:59:16 +0000
Subject: removed warnings

Originally committed as revision 2248 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/i386/motion_est_mmx.c | 2 +-
 libavcodec/mjpeg.c               | 3 ++-
 libavcodec/mpegvideo.h           | 1 +
 libavcodec/ratecontrol.c         | 1 +
 libavcodec/utils.c               | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c
index 5c4b32d..9e88ce2 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -26,7 +26,7 @@ static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
 0x0002000200020002,
 };
 
-static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
+static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
 
 static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
 {
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 80a3aba..647e71d 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -289,6 +289,7 @@ void mjpeg_close(MpegEncContext *s)
         case 4: ret= left   +   top - topleft; break;\
         case 5: ret= left   + ((top - topleft)>>1); break;\
         case 6: ret= top + ((left   - topleft)>>1); break;\
+        default:\
         case 7: ret= (left + top)>>1; break;\
     }
 
@@ -1364,7 +1365,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s){
 
 static int mjpeg_decode_sos(MJpegDecodeContext *s)
 {
-    int len, nb_components, i, h, v, predictor, point_transform, ilv;
+    int len, nb_components, i, h, v, predictor, point_transform;
     int vmax, hmax, index, id;
     const int block_size= s->lossless ? 1 : 8;
 
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index db56c3b..58af196 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -869,6 +869,7 @@ int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size);
 int ff_msmpeg4_decode_init(MpegEncContext *s);
 void ff_msmpeg4_encode_init(MpegEncContext *s);
 int ff_wmv2_decode_picture_header(MpegEncContext * s);
+int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
 void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
 void ff_mspel_motion(MpegEncContext *s,
                                uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 23c7478..2aeb12b 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -602,6 +602,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s)
 
     var= pict_type == I_TYPE ? pic->mb_var_sum : pic->mc_mb_var_sum;
     
+    short_term_q = 0; /* avoid warning */
     if(s->flags&CODEC_FLAG_PASS2){
         if(pict_type!=I_TYPE)
             assert(pict_type == rce->new_pict_type);
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c270588..f441ca2 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -222,6 +222,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
     assert(pic->type==FF_BUFFER_TYPE_INTERNAL);
     assert(s->internal_buffer_count);
 
+    buf = NULL; /* avoids warning */
     for(i=0; i<s->internal_buffer_count; i++){ //just 3-5 checks so is not worth to optimize
         buf= &((InternalBuffer*)s->internal_buffer)[i];
         if(buf->data[0] == pic->data[0])
-- 
cgit v1.1