Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-05 06:39:25 +0300
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-14 17:04:01 +0300
commit6aaac24d72a7da631173209841a3944fcb4a3309 (patch)
tree4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/af_resample.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/af_resample.c')
-rw-r--r--libavfilter/af_resample.c31
1 files changed, 17 insertions, 14 deletions
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index 375f480bcf..e3c6a20696 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -90,22 +90,25 @@ static int query_formats(AVFilterContext *ctx)
{
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
+ AVFilterFormats *in_formats, *out_formats, *in_samplerates, *out_samplerates;
+ AVFilterChannelLayouts *in_layouts, *out_layouts;
+ int ret;
- AVFilterFormats *in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
- AVFilterFormats *out_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
- AVFilterFormats *in_samplerates = ff_all_samplerates();
- AVFilterFormats *out_samplerates = ff_all_samplerates();
- AVFilterChannelLayouts *in_layouts = ff_all_channel_layouts();
- AVFilterChannelLayouts *out_layouts = ff_all_channel_layouts();
-
- ff_formats_ref(in_formats, &inlink->out_formats);
- ff_formats_ref(out_formats, &outlink->in_formats);
-
- ff_formats_ref(in_samplerates, &inlink->out_samplerates);
- ff_formats_ref(out_samplerates, &outlink->in_samplerates);
+ if (!(in_formats = ff_all_formats (AVMEDIA_TYPE_AUDIO)) ||
+ !(out_formats = ff_all_formats (AVMEDIA_TYPE_AUDIO)) ||
+ !(in_samplerates = ff_all_samplerates ( )) ||
+ !(out_samplerates = ff_all_samplerates ( )) ||
+ !(in_layouts = ff_all_channel_layouts ( )) ||
+ !(out_layouts = ff_all_channel_layouts ( )))
+ return AVERROR(ENOMEM);
- ff_channel_layouts_ref(in_layouts, &inlink->out_channel_layouts);
- ff_channel_layouts_ref(out_layouts, &outlink->in_channel_layouts);
+ if ((ret = ff_formats_ref (in_formats, &inlink->out_formats )) < 0 ||
+ (ret = ff_formats_ref (out_formats, &outlink->in_formats )) < 0 ||
+ (ret = ff_formats_ref (in_samplerates, &inlink->out_samplerates )) < 0 ||
+ (ret = ff_formats_ref (out_samplerates, &outlink->in_samplerates )) < 0 ||
+ (ret = ff_channel_layouts_ref (in_layouts, &inlink->out_channel_layouts)) < 0 ||
+ (ret = ff_channel_layouts_ref (out_layouts, &outlink->in_channel_layouts)) < 0)
+ return ret;
return 0;
}