virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/af_ladspa: check functions return value in query_formats

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2015-10-18 02:00:21 +02:00
parent 62144b225d
commit 002b0499b6
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libavfilter/af_ladspa.c
View File

@@ -597,22 +597,29 @@ static int query_formats(AVFilterContext *ctx)
AVFilterChannelLayouts *layouts; AVFilterChannelLayouts *layouts;
static const enum AVSampleFormat sample_fmts[] = { static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }; AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE };
int ret;
formats = ff_make_format_list(sample_fmts); formats = ff_make_format_list(sample_fmts);
if (!formats) if (!formats)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_set_common_formats(ctx, formats); ret = ff_set_common_formats(ctx, formats);
if (ret < 0)
return ret;
if (s->nb_inputs) { if (s->nb_inputs) {
formats = ff_all_samplerates(); formats = ff_all_samplerates();
if (!formats) if (!formats)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_set_common_samplerates(ctx, formats); ret = ff_set_common_samplerates(ctx, formats);
if (ret < 0)
return ret;
} else { } else {
int sample_rates[] = { s->sample_rate, -1 }; int sample_rates[] = { s->sample_rate, -1 };
ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates)); ret = ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates));
if (ret < 0)
return ret;
} }
if (s->nb_inputs == 1 && s->nb_outputs == 1) { if (s->nb_inputs == 1 && s->nb_outputs == 1) {
@@ -621,11 +628,17 @@ static int query_formats(AVFilterContext *ctx)
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;
} else if (s->nb_inputs == 2 && s->nb_outputs == 2) { } else if (s->nb_inputs == 2 && s->nb_outputs == 2) {
layouts = NULL; layouts = NULL;
ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO); ret = ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO);
ff_set_common_channel_layouts(ctx, layouts); if (ret < 0)
return ret;
ret = ff_set_common_channel_layouts(ctx, layouts);
if (ret < 0)
return ret;
} else { } else {
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
@@ -634,19 +647,30 @@ static int query_formats(AVFilterContext *ctx)
int64_t inlayout = FF_COUNT2LAYOUT(s->nb_inputs); int64_t inlayout = FF_COUNT2LAYOUT(s->nb_inputs);
layouts = NULL; layouts = NULL;
ff_add_channel_layout(&layouts, inlayout); ret = ff_add_channel_layout(&layouts, inlayout);
ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts); if (ret < 0)
return ret;
ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
if (ret < 0)
return ret;
if (!s->nb_outputs) if (!s->nb_outputs) {
ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts); ret = ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
if (ret < 0)
return ret;
}
} }
if (s->nb_outputs >= 1) { if (s->nb_outputs >= 1) {
int64_t outlayout = FF_COUNT2LAYOUT(s->nb_outputs); int64_t outlayout = FF_COUNT2LAYOUT(s->nb_outputs);
layouts = NULL; layouts = NULL;
ff_add_channel_layout(&layouts, outlayout); ret = ff_add_channel_layout(&layouts, outlayout);
ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts); if (ret < 0)
return ret;
ret = ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts);
if (ret < 0)
return ret;
} }
} }