From 95682d8cd210f5ca2dff24bfe926333b3745e4da Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Tue, 2 Oct 2012 14:12:27 -0400 Subject: [PATCH 1/2] avconv: fix variable shadowing in configure_input_audio_filter() --- avconv_filter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/avconv_filter.c b/avconv_filter.c index f51e3e1456..8f430b0be4 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -426,7 +426,6 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, if (audio_sync_method > 0) { AVFilterContext *async; - char args[256]; int len = 0; av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " From e2718e7a7006908d7fb9bb003a92f28d58fa6e21 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 28 Nov 2012 21:23:57 +0100 Subject: [PATCH 2/2] avplay: Do not use removed av_get_int() Fixes build with lavfi disabled. Signed-off-by: Diego Biurrun --- avplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/avplay.c b/avplay.c index 0e85dc1e5d..3e2110f423 100644 --- a/avplay.c +++ b/avplay.c @@ -84,7 +84,7 @@ const int program_birth_year = 2003; /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */ #define SAMPLE_ARRAY_SIZE (2 * 65536) -static int sws_flags = SWS_BICUBIC; +static int64_t sws_flags = SWS_BICUBIC; typedef struct PacketQueue { AVPacketList *first_pkt, *last_pkt; @@ -1398,7 +1398,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t av_picture_copy(&pict, &pict_src, vp->pix_fmt, vp->width, vp->height); #else - sws_flags = av_get_int(sws_opts, "sws_flags", NULL); + av_opt_get_int(sws_opts, "sws_flags", 0, &sws_flags); is->img_convert_ctx = sws_getCachedContext(is->img_convert_ctx, vp->width, vp->height, vp->pix_fmt, vp->width, vp->height, dst_pix_fmt, sws_flags, NULL, NULL, NULL); @@ -1515,7 +1515,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c AVFilterContext *filt_src = NULL, *filt_out = NULL, *filt_format; AVCodecContext *codec = is->video_st->codec; - snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); + snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%"PRId64, sws_flags); graph->scale_sws_opts = av_strdup(sws_flags_str); snprintf(buffersrc_args, sizeof(buffersrc_args), "%d:%d:%d:%d:%d:%d:%d",