virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfiltergraph: silence an uninitialized variable warning

Browse Source 
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.
This commit is contained in:
Anton Khirnov 2012-08-18 16:51:32 +02:00
parent 34ebbbfeec
commit e3496e5dbe
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/avfiltergraph.c
View File

@ -476,7 +476,7 @@ static void swap_channel_layouts_on_filter(AVFilterContext *filter)
for (i = 0; i < filter->nb_outputs; i++) { for (i = 0; i < filter->nb_outputs; i++) {
AVFilterLink *outlink = filter->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 || if (outlink->type != AVMEDIA_TYPE_AUDIO ||
outlink->in_channel_layouts->nb_channel_layouts < 2) 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; best_count_diff = count_diff;
} }
} }
av_assert0(best_idx >= 0);
FFSWAP(uint64_t, outlink->in_channel_layouts->channel_layouts[0], FFSWAP(uint64_t, outlink->in_channel_layouts->channel_layouts[0],
outlink->in_channel_layouts->channel_layouts[best_idx]); outlink->in_channel_layouts->channel_layouts[best_idx]);
} }