summaryrefslogtreecommitdiff
path: root/libavfilter/buffersrc.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/buffersrc.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/buffersrc.c')
-rw-r--r--libavfilter/buffersrc.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 45e219a084..3920b048db 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -314,23 +314,27 @@ static int query_formats(AVFilterContext *ctx)
AVFilterChannelLayouts *channel_layouts = NULL;
AVFilterFormats *formats = NULL;
AVFilterFormats *samplerates = NULL;
+ int ret;
switch (ctx->outputs[0]->type) {
case AVMEDIA_TYPE_VIDEO:
- ff_add_format(&formats, c->pix_fmt);
- ff_set_common_formats(ctx, formats);
+ if ((ret = ff_add_format (&formats, c->pix_fmt)) < 0 ||
+ (ret = ff_set_common_formats (ctx , formats )) < 0)
+ return ret;
break;
case AVMEDIA_TYPE_AUDIO:
- ff_add_format(&formats, c->sample_fmt);
- ff_set_common_formats(ctx, formats);
-
- ff_add_format(&samplerates, c->sample_rate);
- ff_set_common_samplerates(ctx, samplerates);
+ if ((ret = ff_add_format (&formats , c->sample_fmt )) < 0 ||
+ (ret = ff_set_common_formats (ctx , formats )) < 0 ||
+ (ret = ff_add_format (&samplerates, c->sample_rate)) < 0 ||
+ (ret = ff_set_common_samplerates (ctx , samplerates )) < 0)
+ return ret;
- ff_add_channel_layout(&channel_layouts,
+ if ((ret = ff_add_channel_layout(&channel_layouts,
c->channel_layout ? c->channel_layout :
- FF_COUNT2LAYOUT(c->channels));
- ff_set_common_channel_layouts(ctx, channel_layouts);
+ FF_COUNT2LAYOUT(c->channels))) < 0)
+ return ret;
+ if ((ret = ff_set_common_channel_layouts(ctx, channel_layouts)) < 0)
+ return ret;
break;
default:
return AVERROR(EINVAL);