[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec parser.c, 1.28, 1.29 pnm.c, 1.12, 1.13 rangecoder.c, 1.2, 1.3 vp3dsp.c, 1.6, 1.7

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv7814/libavcodec

Modified Files:
	parser.c pnm.c rangecoder.c vp3dsp.c 
Log Message:
Kill some compiler warnings.  Compiled code verified identical after changes.


Index: parser.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/parser.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- parser.c	26 Aug 2005 19:05:44 -0000	1.28
+++ parser.c	6 Sep 2005 21:25:34 -0000	1.29
@@ -159,7 +159,8 @@
         }
     }
 
-    *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))

Index: pnm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/pnm.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pnm.c	21 Aug 2005 15:44:59 -0000	1.12
+++ pnm.c	6 Sep 2005 21:25:34 -0000	1.13
@@ -473,8 +473,8 @@
         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){

Index: rangecoder.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/rangecoder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rangecoder.c	24 Feb 2005 19:08:50 -0000	1.2
+++ rangecoder.c	6 Sep 2005 21:25:34 -0000	1.3
@@ -49,7 +49,8 @@
 }
 
 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++;

Index: vp3dsp.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3dsp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vp3dsp.c	14 Aug 2005 15:42:40 -0000	1.6
+++ vp3dsp.c	6 Sep 2005 21:25:34 -0000	1.7
@@ -25,7 +25,6 @@
 #include "common.h"
 #include "avcodec.h"
 #include "dsputil.h"
-#include "vp3data.h"
 
 #define IdctAdjustBeforeShift 8
 #define xC1S7 64277