Browse Source

avfilter/avfiltergraph: fix -Wunused-result warnings

Commit bf0d2d6030 introduced
av_warn_unused_result to avfilter/formats, whose associated warnings
were mostly fixed in 6aaac24d72. 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>
tags/n3.0
Ganesh Ajjanagadde 9 years ago
parent
commit
3835554bf8
1 changed files with 13 additions and 6 deletions
  1. +13
    -6
      libavfilter/avfiltergraph.c

+ 13
- 6
libavfilter/avfiltergraph.c View File

@@ -745,7 +745,8 @@ do { \
fmts = out_link->in_ ## list; \
\
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; \
break; \
} \
@@ -811,16 +812,21 @@ static int reduce_formats_on_filter(AVFilterContext *filter)
return ret;
}

static void reduce_formats(AVFilterGraph *graph)
static int reduce_formats(AVFilterGraph *graph)
{
int i, reduced;
int i, reduced, ret;

do {
reduced = 0;

for (i = 0; i < graph->nb_filters; i++)
reduced |= reduce_formats_on_filter(graph->filters[i]);
for (i = 0; i < graph->nb_filters; i++) {
if ((ret = reduce_formats_on_filter(graph->filters[i])) < 0)
return ret;
reduced |= ret;
}
} while (reduced);

return 0;
}

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
* multiple valid media format choices. We try to minimize the amount
* 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
* is selected */


Loading…
Cancel
Save