[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avidec.c, 1.75, 1.76 movenc.c, 1.43, 1.44 mpegts.c, 1.31, 1.32 utils.c, 1.165, 1.166

[Måns Rullgård CVS]

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

Modified Files:
	avidec.c movenc.c mpegts.c utils.c 
Log Message:
Kill some compiler warnings.  Compiled code verified identical after changes.


Index: avidec.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avidec.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- avidec.c	15 Aug 2005 15:58:21 -0000	1.75
+++ avidec.c	6 Sep 2005 21:25:35 -0000	1.76
@@ -366,7 +366,7 @@
     }
     
     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;

Index: movenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- movenc.c	17 Jul 2005 22:24:35 -0000	1.43
+++ movenc.c	6 Sep 2005 21:25:35 -0000	1.44
@@ -432,13 +432,13 @@
         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;
         }
     }
 

Index: mpegts.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpegts.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mpegts.c	17 Jul 2005 22:24:35 -0000	1.31
+++ mpegts.c	6 Sep 2005 21:25:35 -0000	1.32
@@ -376,7 +376,7 @@
     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

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- utils.c	2 Sep 2005 19:16:48 -0000	1.165
+++ utils.c	6 Sep 2005 21:25:35 -0000	1.166
@@ -981,7 +981,6 @@
         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){