summaryrefslogtreecommitdiff
path: root/libavfilter/aeval.c
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-04 23:39:25 -0400
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-14 10:04:01 -0400
commit6aaac24d72a7da631173209841a3944fcb4a3309 (patch)
tree4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/aeval.c
parent8ededd583622359062622cf008144a1511d50bbd (diff)
avfilter/all: propagate errors of functions from avfilter/formats
Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM). This propagates the return values. All of these were found by using av_warn_unused_result, demonstrating its utility. Tested with FATE. I am least sure of the changes to avfilter/filtergraph, since I don't know what/how reduce_format is intended to behave and how it should react to errors. Fixes: CID 1325680, 1325679, 1325678. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Previous version Reviewed-by: Nicolas George <george@nsup.org> Previous version Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Diffstat (limited to 'libavfilter/aeval.c')
-rw-r--r--libavfilter/aeval.c28
1 files changed, 13 insertions, 15 deletions
diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c
index b6c420a4a9..ac9dea8f64 100644
--- a/libavfilter/aeval.c
+++ b/libavfilter/aeval.c
@@ -350,36 +350,34 @@ static int aeval_query_formats(AVFilterContext *ctx)
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE
};
+ int ret;
// inlink supports any channel layout
layouts = ff_all_channel_counts();
- ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
+ if ((ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts)) < 0)
+ return ret;
if (eval->same_chlayout) {
layouts = ff_all_channel_counts();
- if (!layouts)
- return AVERROR(ENOMEM);
- ff_set_common_channel_layouts(ctx, layouts);
+ if ((ret = ff_set_common_channel_layouts(ctx, layouts)) < 0)
+ return ret;
} else {
// outlink supports only requested output channel layout
layouts = NULL;
- ff_add_channel_layout(&layouts,
+ if ((ret = ff_add_channel_layout(&layouts,
eval->out_channel_layout ? eval->out_channel_layout :
- FF_COUNT2LAYOUT(eval->nb_channels));
- ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
+ FF_COUNT2LAYOUT(eval->nb_channels))) < 0)
+ return ret;
+ if ((ret = ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts)) < 0)
+ return ret;
}
formats = ff_make_format_list(sample_fmts);
- if (!formats)
- return AVERROR(ENOMEM);
- ff_set_common_formats(ctx, formats);
+ if ((ret = ff_set_common_formats(ctx, formats)) < 0)
+ return ret;
formats = ff_all_samplerates();
- if (!formats)
- return AVERROR(ENOMEM);
- ff_set_common_samplerates(ctx, formats);
-
- return 0;
+ return ff_set_common_samplerates(ctx, formats);
}
static int aeval_config_output(AVFilterLink *outlink)