summaryrefslogtreecommitdiff
path: root/libavfilter/asrc_flite.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/asrc_flite.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/asrc_flite.c')
-rw-r--r--libavfilter/asrc_flite.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c
index a99f2dc923..b3f83abd74 100644
--- a/libavfilter/asrc_flite.c
+++ b/libavfilter/asrc_flite.c
@@ -205,18 +205,20 @@ static av_cold void uninit(AVFilterContext *ctx)
static int query_formats(AVFilterContext *ctx)
{
FliteContext *flite = ctx->priv;
+ int ret;
AVFilterChannelLayouts *chlayouts = NULL;
int64_t chlayout = av_get_default_channel_layout(flite->wave->num_channels);
AVFilterFormats *sample_formats = NULL;
AVFilterFormats *sample_rates = NULL;
- ff_add_channel_layout(&chlayouts, chlayout);
- ff_set_common_channel_layouts(ctx, chlayouts);
- ff_add_format(&sample_formats, AV_SAMPLE_FMT_S16);
- ff_set_common_formats(ctx, sample_formats);
- ff_add_format(&sample_rates, flite->wave->sample_rate);
- ff_set_common_samplerates (ctx, sample_rates);
+ if ((ret = ff_add_channel_layout (&chlayouts , chlayout )) < 0 ||
+ (ret = ff_set_common_channel_layouts (ctx , chlayouts )) < 0 ||
+ (ret = ff_add_format (&sample_formats, AV_SAMPLE_FMT_S16 )) < 0 ||
+ (ret = ff_set_common_formats (ctx , sample_formats )) < 0 ||
+ (ret = ff_add_format (&sample_rates , flite->wave->sample_rate)) < 0 ||
+ (ret = ff_set_common_samplerates (ctx , sample_rates )) < 0)
+ return ret;
return 0;
}