diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-18 16:51:32 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-09-17 15:48:20 +0200 |
| commit | e3496e5dbe277e056800ebe7740ac6467d35d5cb (patch) | |
| tree | 193a55994f0a4d3831c8c4d08133fa2a7c22cb76 /libavfilter | |
| parent | 34ebbbfeecd6f535c75dfddf2d21d198e1613300 (diff) | |
| download | ffmpeg-e3496e5dbe277e056800ebe7740ac6467d35d5cb.tar.gz | |
avfiltergraph: silence an uninitialized variable warning
The warning is:
libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’:
libavfilter/avfiltergraph.c:528:9: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]
libavfilter/avfiltergraph.c:479:13: note: ‘best_idx’ was declared here
Initialize it to an invalid value and add an assert that it's properly
set later.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 525a1dc6c7..4a66c7842a 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -476,7 +476,7 @@ static void swap_channel_layouts_on_filter(AVFilterContext *filter) for (i = 0; i < filter->nb_outputs; i++) { AVFilterLink *outlink = filter->outputs[i]; - int best_idx, best_score = INT_MIN, best_count_diff = INT_MAX; + int best_idx = -1, best_score = INT_MIN, best_count_diff = INT_MAX; if (outlink->type != AVMEDIA_TYPE_AUDIO || outlink->in_channel_layouts->nb_channel_layouts < 2) @@ -525,6 +525,7 @@ static void swap_channel_layouts_on_filter(AVFilterContext *filter) best_count_diff = count_diff; } } + av_assert0(best_idx >= 0); FFSWAP(uint64_t, outlink->in_channel_layouts->channel_layouts[0], outlink->in_channel_layouts->channel_layouts[best_idx]); } |