Kill some compiler warnings. Compiled code verified identical after changes.

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

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 6bd2b32b9d06762195b923004422140a7db763f5..7c3d7efe7eff8553e25a4aa8f79e508a1e9e19a2 100644 (file)
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -1080,7 +1080,8 @@ static int hf_noise16_mmx(uint8_t * pix1, int line_size, int h) {
       return tmp + hf_noise8_mmx(pix+8, line_size, h);
 }
 
-static int nsse16_mmx(MpegEncContext *c, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
+static int nsse16_mmx(void *p, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
+    MpegEncContext *c = p;
     int score1= sse16_mmx(c, pix1, pix2, line_size, h);
     int score2= hf_noise16_mmx(pix1, line_size, h) - hf_noise16_mmx(pix2, line_size, h);
 
@@ -1088,7 +1089,8 @@ static int nsse16_mmx(MpegEncContext *c, uint8_t * pix1, uint8_t * pix2, int lin
     else  return score1 + ABS(score2)*8;
 }
 
-static int nsse8_mmx(MpegEncContext *c, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
+static int nsse8_mmx(void *p, uint8_t * pix1, uint8_t * pix2, int line_size, int h) {
+    MpegEncContext *c = p;
     int score1= sse8_mmx(c, pix1, pix2, line_size, h);
     int score2= hf_noise8_mmx(pix1, line_size, h) - hf_noise8_mmx(pix2, line_size, h);
 

diff --git a/libavcodec/i386/dsputil_mmx_rnd.h b/libavcodec/i386/dsputil_mmx_rnd.h
index 20ea1b59e63b84374f4941b8395b7235fa0948e6..a56374b63ecbbeb35d09a1d7b29b0829af2df03b 100644 (file)
--- a/libavcodec/i386/dsputil_mmx_rnd.h
+++ b/libavcodec/i386/dsputil_mmx_rnd.h
@@ -55,7 +55,7 @@ static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line
        :REG_a, "memory");
 }
 
-static void DEF(put, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+static void attribute_unused DEF(put, pixels8_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
 {
     MOVQ_BFE(mm6);
     __asm __volatile(
@@ -151,7 +151,7 @@ static void DEF(put, pixels16_x2)(uint8_t *block, const uint8_t *pixels, int lin
        :REG_a, "memory");
 }
 
-static void DEF(put, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
+static void attribute_unused DEF(put, pixels16_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int dstStride, int src1Stride, int h)
 {
     MOVQ_BFE(mm6);
     __asm __volatile(
@@ -296,7 +296,7 @@ static void DEF(put, pixels8_xy2)(uint8_t *block, const uint8_t *pixels, int lin
 }
 
 // avg_pixels
-static void DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
+static void attribute_unused DEF(avg, pixels4)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
 {
     MOVQ_BFE(mm6);
     JUMPALIGN();

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 4d5cb19d222d433b1afa6db83df1e398aa0a2e22..06cb7d177085e10dfb4eb105fcd4975d1405dd9d 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -159,7 +159,8 @@ int av_parser_change(AVCodecParserContext *s,
         }
     }
 
-    *poutbuf= buf;
+    /* cast to avoid warning about discarding qualifiers */
+    *poutbuf= (uint8_t *) buf;
     *poutbuf_size= buf_size;
     if(avctx->extradata){
         if(  (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))

diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index aae798bcaa25e60d4098c44f584d49d125fb4ae9..1df61843362cce053af33ee162e4027a2d6c85ea 100644 (file)
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -473,8 +473,8 @@ retry:
         pnmctx.bytestream_end= pc->buffer + pc->index;
     }else{
         pnmctx.bytestream_start=
-        pnmctx.bytestream= buf;
-        pnmctx.bytestream_end= buf + buf_size;
+        pnmctx.bytestream= (uint8_t *) buf; /* casts avoid warnings */
+        pnmctx.bytestream_end= (uint8_t *) buf + buf_size;
     }
     if(pnm_decode_header(avctx, &pnmctx) < 0){
         if(pnmctx.bytestream < pnmctx.bytestream_end){

diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index ba3022c45c315ecd0fd8d82b1925107702c34986..730d5a87c1df0de1c76f0e9035ede0e9027a25d0 100644 (file)
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -49,7 +49,8 @@ void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size){
 }
 
 void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){
-    ff_init_range_encoder(c, buf, buf_size);
+    /* cast to avoid compiler warning */
+    ff_init_range_encoder(c, (uint8_t *) buf, buf_size);
 
     c->low =(*c->bytestream++)<<8;
     c->low+= *c->bytestream++;

diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
index 047fee763e77a282bbdfbcf5480133278b013c1c..1fa6d094b6c6190c13081ccf9a582d898956d230 100644 (file)
--- a/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@@ -25,7 +25,6 @@
 #include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
-#include "vp3data.h"
 
 #define IdctAdjustBeforeShift 8
 #define xC1S7 64277

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 01b1a9d8c9101221773b7c5286ce4c9ae4037a9c..b08711a5f32c2ce3f6c813d3265ce1ea2e1643e1 100644 (file)
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -366,7 +366,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
     }
     
     if(avi->non_interleaved){
-        int best_stream_index;
+        int best_stream_index = 0;
         AVStream *best_st= NULL;
         AVIStream *best_ast;
         int64_t best_ts= INT64_MAX;

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 912fa4b21cde32153ffe8d097661e6008b016d84..38bb687b0946ae84707301e3189b49a07e8fb7fb 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -432,13 +432,13 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
         if (track->enc->codec_id == CODEC_ID_AAC)
         {
             track->vosLen = 2;
-            track->vosData = PSPAACData;
+            track->vosData = (uint8_t *) PSPAACData;
         }
 
         if (track->enc->codec_id == CODEC_ID_MPEG4)
         {
             track->vosLen = 28;
-            track->vosData = PSPMP4Data;
+            track->vosData = (uint8_t *) PSPMP4Data;
         }
     }
 

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 0e15f551cf9c2dddd961f00d96994c2ddd20e16f..e879da90b4e097e3acdcb89be66ad6f5484823a7 100644 (file)
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -376,7 +376,7 @@ static void pmt_cb(void *opaque, const uint8_t *section, int section_len)
     const uint8_t *p, *p_end, *desc_list_end, *desc_end;
     int program_info_length, pcr_pid, pid, stream_type;
     int desc_list_len, desc_len, desc_tag;
-    int comp_page, anc_page;
+    int comp_page = 0, anc_page = 0; /* initialize to kill warnings */
     char language[4];
     
 #ifdef DEBUG_SI

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7dede05b49841fc553a315bc5d5f3d2662d97cea..edac0b877d72a26250c4f69ce1c4c4005d0aefed 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -981,7 +981,6 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
         pktl = s->packet_buffer;
         if (pktl) {
             AVPacket *next_pkt= &pktl->pkt;
-            AVStream *st= s->streams[ next_pkt->stream_index ];
 
             if(genpts && next_pkt->dts != AV_NOPTS_VALUE){
                 while(pktl && next_pkt->pts == AV_NOPTS_VALUE){