summaryrefslogtreecommitdiff
path: root/libavfilter/af_amerge.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-09-11 18:36:09 +0200
committerClément Bœsch <ubitux@gmail.com>2012-09-11 18:38:09 +0200
commitbbae8cdf4db52300d3c2f1f9637d3fd10fb3a7b0 (patch)
treebc401888188adba841eee8e1acf776022b5090a2 /libavfilter/af_amerge.c
parent0ea65bbeee43e45925d9479d0333c163cc22c637 (diff)
lavfi/amerge: avoid a forward declaration.
Diffstat (limited to 'libavfilter/af_amerge.c')
-rw-r--r--libavfilter/af_amerge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 1ff3c8ca98..db3539d7ff 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -309,14 +309,14 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return AVERROR(ENOMEM);
for (i = 0; i < am->nb_inputs; i++) {
char *name = av_asprintf("in%d", i);
- if (!name)
- return AVERROR(ENOMEM);
AVFilterPad pad = {
.name = name,
.type = AVMEDIA_TYPE_AUDIO,
.filter_samples = filter_samples,
.min_perms = AV_PERM_READ | AV_PERM_PRESERVE,
};
+ if (!name)
+ return AVERROR(ENOMEM);
ff_insert_inpad(ctx, i, &pad);
}
return 0;