har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/avfiltergraph: fix -Wunused-result warnings

Browse Source 
Commit bf0d2d6030c239f91e0368a20fb2dc0705bfec99 introduced
av_warn_unused_result to avfilter/formats, whose associated warnings
were mostly fixed in 6aaac24d72a7da631173209841a3944fcb4a3309. This
fixes the issues in avfilter/avfiltergraph.

Tested with FATE.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
Ganesh Ajjanagadde 2015-10-14 22:26:38 -04:00
parent 27d23ae074
commit 3835554bf8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/avfiltergraph.c
View File

@ -745,7 +745,8 @@ do { \
fmts = out_link->in_ ## list; \ fmts = out_link->in_ ## list; \
\ \
if (!out_link->in_ ## list->nb) { \ if (!out_link->in_ ## list->nb) { \
add_format(&out_link->in_ ##list, fmt); \ if ((ret = add_format(&out_link->in_ ##list, fmt)) < 0)\
return ret; \
ret = 1; \ ret = 1; \
break; \ break; \
} \ } \
@ -811,16 +812,21 @@ static int reduce_formats_on_filter(AVFilterContext *filter)
return ret; return ret;
} }
static void reduce_formats(AVFilterGraph *graph) static int reduce_formats(AVFilterGraph *graph)
{ {
int i, reduced; int i, reduced, ret;
do { do {
reduced = 0; reduced = 0;
for (i = 0; i < graph->nb_filters; i++) for (i = 0; i < graph->nb_filters; i++) {
reduced |= reduce_formats_on_filter(graph->filters[i]); if ((ret = reduce_formats_on_filter(graph->filters[i])) < 0)
return ret;
reduced |= ret;
}
} while (reduced); } while (reduced);
return 0;
} }
static void swap_samplerates_on_filter(AVFilterContext *filter) static void swap_samplerates_on_filter(AVFilterContext *filter)
@ -1138,7 +1144,8 @@ static int graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx)
/* Once everything is merged, it's possible that we'll still have /* Once everything is merged, it's possible that we'll still have
* multiple valid media format choices. We try to minimize the amount * multiple valid media format choices. We try to minimize the amount
* of format conversion inside filters */ * of format conversion inside filters */
reduce_formats(graph); if ((ret = reduce_formats(graph)) < 0)
return ret;
/* for audio filters, ensure the best format, sample rate and channel layout /* for audio filters, ensure the best format, sample rate and channel layout
* is selected */ * is selected */