X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Favf_avectorscope.c;h=30985f3d4969aa858338faccf4acca547f17b245;hb=b66a94ab539cbebf8dc6ca53d81dfa47d6dd59ac;hp=bc9e2356bcebab78414fb6fe3062a00ccd97a7b8;hpb=3d481f39a272acca7b51d53f4711f0996087a430;p=ffmpeg diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c index bc9e2356bce..30985f3d496 100644 --- a/libavfilter/avf_avectorscope.c +++ b/libavfilter/avf_avectorscope.c @@ -126,24 +126,21 @@ static int query_formats(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }; static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE }; + int ret; formats = ff_make_format_list(sample_fmts); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &inlink->out_formats); - - ff_add_channel_layout(&layout, AV_CH_LAYOUT_STEREO); - ff_channel_layouts_ref(layout, &inlink->out_channel_layouts); + if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || + (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || + (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0) + return ret; formats = ff_all_samplerates(); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &inlink->out_samplerates); + if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0) + return ret; formats = ff_make_format_list(pix_fmts); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &outlink->in_formats); + if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) + return ret; return 0; }