[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avidec.c, 1.73, 1.74 nsvdec.c, 1.9, 1.10 utils.c, 1.159, 1.160 yuv4mpeg.c, 1.24, 1.25

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv30264/libavformat

Modified Files:
	avidec.c nsvdec.c utils.c yuv4mpeg.c 
Log Message:
kill a bunch of compiler warnings


Index: avidec.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avidec.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- avidec.c	17 Jul 2005 22:24:35 -0000	1.73
+++ avidec.c	14 Aug 2005 15:42:40 -0000	1.74
@@ -644,14 +644,12 @@
 }
 
 static int guess_ni_flag(AVFormatContext *s){
-    AVIContext *avi = s->priv_data;
     int i;
     int64_t last_start=0;
     int64_t first_end= INT64_MAX;
     
     for(i=0; i<s->nb_streams; i++){
         AVStream *st = s->streams[i];
-        AVIStream *ast = st->priv_data;
         int n= st->nb_index_entries;
 
         if(n <= 0)

Index: nsvdec.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/nsvdec.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- nsvdec.c	17 Jul 2005 22:24:35 -0000	1.9
+++ nsvdec.c	14 Aug 2005 15:42:40 -0000	1.10
@@ -297,8 +297,8 @@
 
     //s->file_size = (uint32_t)get_le32(pb);
     file_size = (uint32_t)get_le32(pb);
-    PRINT(("NSV NSVf chunk_size %ld\n", size));
-    PRINT(("NSV NSVf file_size %Ld\n", file_size));
+    PRINT(("NSV NSVf chunk_size %u\n", size));
+    PRINT(("NSV NSVf file_size %u\n", file_size));
 
     nsv->duration = duration = get_le32(pb); /* in ms */
     PRINT(("NSV NSVf duration %Ld ms\n", duration));
@@ -561,7 +561,7 @@
     asize = get_le16(pb);
     vsize = (vsize << 4) | (auxcount >> 4);
     auxcount &= 0x0f;
-    PRINT(("NSV CHUNK %d aux, %ld bytes video, %d bytes audio\n", auxcount, vsize, asize));
+    PRINT(("NSV CHUNK %d aux, %u bytes video, %d bytes audio\n", auxcount, vsize, asize));
     /* skip aux stuff */
     for (i = 0; i < auxcount; i++) {
         auxsize = get_le16(pb);
@@ -614,7 +614,7 @@
             channels = get_byte(pb);
             samplerate = get_le16(pb);
             asize-=4;
-            PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %ld\n", bps, channels, samplerate));
+            PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate));
             if (fill_header) {
                 st[NSV_ST_AUDIO]->need_parsing = 0; /* we know everything */
                 if (bps != 16) {
@@ -629,7 +629,7 @@
                 st[NSV_ST_AUDIO]->codec->sample_rate = samplerate;
                 av_set_pts_info(st[NSV_ST_AUDIO], 64, 1, 
                                 st[NSV_ST_AUDIO]->codec->sample_rate);
-                PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %ld\n", bps, channels, samplerate));
+                PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate));
             }
         }
         av_get_packet(pb, pkt, asize);

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- utils.c	17 Jul 2005 22:24:36 -0000	1.159
+++ utils.c	14 Aug 2005 15:42:40 -0000	1.160
@@ -1569,7 +1569,7 @@
     AVPacket pkt1, *pkt = &pkt1;
     AVStream *st;
     int read_size, i, ret;
-    int64_t start_time, end_time, end_time1;
+    int64_t end_time;
     int64_t filesize, offset, duration;
     
     /* free previous packet */

Index: yuv4mpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/yuv4mpeg.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- yuv4mpeg.c	17 Jul 2005 22:24:36 -0000	1.24
+++ yuv4mpeg.c	14 Aug 2005 15:42:40 -0000	1.25
@@ -336,7 +336,7 @@
 {
     int i;
     char header[MAX_FRAME_HEADER+1];
-    int packet_size, ret, width, height;
+    int packet_size, width, height;
     AVStream *st = s->streams[0];
 
     for (i=0; i<MAX_FRAME_HEADER; i++) {