From 61d158c321a82ec7bfc46ce480997797e8048b85 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 25 Jun 2012 13:01:31 +0200 Subject: avfiltergraph: shut up uninitialized variable warning. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The warning silenced was: libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’: libavfilter/avfiltergraph.c:500:13: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized] --- libavfilter/avfiltergraph.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavfilter/avfiltergraph.c') diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index b9f01645d0..c147c3b781 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -29,6 +29,7 @@ #include "internal.h" #include "libavutil/audioconvert.h" +#include "libavutil/avassert.h" #include "libavutil/log.h" static const AVClass filtergraph_class = { @@ -497,7 +498,7 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) for (i = 0; i < filter->nb_outputs; i++) { AVFilterLink *outlink = filter->outputs[i]; - int best_idx, best_score = INT_MIN; + int best_idx = -1, best_score = INT_MIN; if (outlink->type != AVMEDIA_TYPE_AUDIO || outlink->in_formats->format_count < 2) @@ -530,6 +531,7 @@ static void swap_sample_fmts_on_filter(AVFilterContext *filter) best_idx = j; } } + av_assert0(best_idx >= 0); FFSWAP(int, outlink->in_formats->formats[0], outlink->in_formats->formats[best_idx]); } -- cgit v1.2.3