diff options
| author | Måns Rullgård <mans@mansr.com> | 2005-09-06 21:25:35 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2005-09-06 21:25:35 +0000 |
| commit | 79396ac68573628f3b59142601db86a0f4ba7ad5 (patch) | |
| tree | 4dfa0ec8e3e2e4ae1e1a5508ef8b311892ecf6ff /libavformat | |
| parent | b40e353aa49737da9501b092d18011c79def8e30 (diff) | |
| download | ffmpeg-79396ac68573628f3b59142601db86a0f4ba7ad5.tar.gz | |
Kill some compiler warnings. Compiled code verified identical after changes.
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 2 | ||||
| -rw-r--r-- | libavformat/movenc.c | 4 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 01b1a9d8c9..b08711a5f3 100644 --- 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 912fa4b21c..38bb687b09 100644 --- 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 0e15f551cf..e879da90b4 100644 --- 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 7dede05b49..edac0b877d 100644 --- 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){ |