diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 2 | ||||
| -rw-r--r-- | libavformat/nsvdec.c | 10 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/yuv4mpeg.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index f1a25899a6..15bd18a375 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -644,14 +644,12 @@ static int avi_read_idx1(AVFormatContext *s, int size) } 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) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 27c7abc8cc..3082cff1c5 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -297,8 +297,8 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) //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 @@ null_chunk_retry: 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 @@ null_chunk_retry: 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 @@ null_chunk_retry: 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); diff --git a/libavformat/utils.c b/libavformat/utils.c index efa5bcf770..f2091f7684 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1569,7 +1569,7 @@ static void av_estimate_timings_from_pts(AVFormatContext *ic) 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 */ diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 1f38fe8689..30fdc54db5 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -336,7 +336,7 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) { 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++) { |