diff options
author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-05 06:39:25 +0300 |
---|---|---|
committer | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-14 17:04:01 +0300 |
commit | 6aaac24d72a7da631173209841a3944fcb4a3309 (patch) | |
tree | 4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/avf_concat.c | |
parent | 8ededd583622359062622cf008144a1511d50bbd (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/avf_concat.c')
-rw-r--r-- | libavfilter/avf_concat.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 8d736a424c..5a4b356ea8 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -80,6 +80,7 @@ static int query_formats(AVFilterContext *ctx) unsigned type, nb_str, idx0 = 0, idx, str, seg; AVFilterFormats *formats, *rates = NULL; AVFilterChannelLayouts *layouts = NULL; + int ret; for (type = 0; type < TYPE_ALL; type++) { nb_str = cat->nb_streams[type]; @@ -88,26 +89,26 @@ static int query_formats(AVFilterContext *ctx) /* Set the output formats */ formats = ff_all_formats(type); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &ctx->outputs[idx]->in_formats); + if ((ret = ff_formats_ref(formats, &ctx->outputs[idx]->in_formats)) < 0) + return ret; + if (type == AVMEDIA_TYPE_AUDIO) { rates = ff_all_samplerates(); - if (!rates) - return AVERROR(ENOMEM); - ff_formats_ref(rates, &ctx->outputs[idx]->in_samplerates); + if ((ret = ff_formats_ref(rates, &ctx->outputs[idx]->in_samplerates)) < 0) + return ret; layouts = ff_all_channel_layouts(); - if (!layouts) - return AVERROR(ENOMEM); - ff_channel_layouts_ref(layouts, &ctx->outputs[idx]->in_channel_layouts); + if ((ret = ff_channel_layouts_ref(layouts, &ctx->outputs[idx]->in_channel_layouts)) < 0) + return ret; } /* Set the same formats for each corresponding input */ for (seg = 0; seg < cat->nb_segments; seg++) { - ff_formats_ref(formats, &ctx->inputs[idx]->out_formats); + if ((ret = ff_formats_ref(formats, &ctx->inputs[idx]->out_formats)) < 0) + return ret; if (type == AVMEDIA_TYPE_AUDIO) { - ff_formats_ref(rates, &ctx->inputs[idx]->out_samplerates); - ff_channel_layouts_ref(layouts, &ctx->inputs[idx]->out_channel_layouts); + if ((ret = ff_formats_ref(rates, &ctx->inputs[idx]->out_samplerates)) < 0 || + (ret = ff_channel_layouts_ref(layouts, &ctx->inputs[idx]->out_channel_layouts)) < 0) + return ret; } idx += ctx->nb_outputs; } |