diff options
Diffstat (limited to 'libavfilter/af_resample.c')
| -rw-r--r-- | libavfilter/af_resample.c | 31 |
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; } |