From fce99322b0cc0b9e3ce71be0870368e618e54ffa Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 22 Apr 2013 02:53:58 +0200 Subject: [PATCH 1/2] h264: Drop unused variable --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 56ac57b20a..38e471d998 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3015,7 +3015,7 @@ static int h264_slice_header_init(H264Context *h, int reinit) int nb_slices = (HAVE_THREADS && h->avctx->active_thread_type & FF_THREAD_SLICE) ? h->avctx->thread_count : 1; - int i, ret; + int i; h->avctx->sample_aspect_ratio = h->sps.sar; av_assert0(h->avctx->sample_aspect_ratio.den); From a0d5ca4f0a8e2c34d784d503a12af6303424ac6a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 22 Apr 2013 04:50:45 +0200 Subject: [PATCH 2/2] mxfenc: Use correct printf format specifier for int64_t libavformat/mxfenc.c:1861:9: warning: format '%lld' expects argument of type 'long long int', but argument 5 has type 'int64_t' [-Wformat] --- libavformat/mxfenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 995e411273..c6cdd3b3c0 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -32,6 +32,7 @@ //#define DEBUG +#include #include #include @@ -1856,7 +1857,7 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket } *out = pktl->pkt; - av_dlog(s, "out st:%d dts:%lld\n", (*out).stream_index, (*out).dts); + av_dlog(s, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts); s->packet_buffer = pktl->next; if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl) s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL;