Mercurial > libavformat.hg

changeset 851:62e66722e9bb libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Kill some compiler warnings. Compiled code verified identical after changes.
author mru
date Tue, 06 Sep 2005 21:25:35 +0000
parents 89897453def2
children 27c765023958
files avidec.c movenc.c mpegts.c utils.c
diffstat 4 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/avidec.c	Tue Sep 06 15:02:43 2005 +0000
+++ b/avidec.c	Tue Sep 06 21:25:35 2005 +0000
@@ -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;
--- a/movenc.c	Tue Sep 06 15:02:43 2005 +0000
+++ b/movenc.c	Tue Sep 06 21:25:35 2005 +0000
@@ -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;
         }
     }
 
--- a/mpegts.c	Tue Sep 06 15:02:43 2005 +0000
+++ b/mpegts.c	Tue Sep 06 21:25:35 2005 +0000
@@ -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
--- a/utils.c	Tue Sep 06 15:02:43 2005 +0000
+++ b/utils.c	Tue Sep 06 21:25:35 2005 +0000
@@ -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){