From 48f30595f5db210885eddf2b2397236134fdcbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Thu, 17 May 2012 19:32:17 +0200
Subject: [PATCH] pan: use ff_parse_channel_layout() instead of
av_get_channel_layout().
This allow specifying hexadecimal channel layout, and also handle the
error printing internally.
---
libavfilter/af_pan.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index d8c4116a071..0a1bf320613 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -34,6 +34,7 @@
#include "audio.h"
#include "avfilter.h"
#include "formats.h"
+#include "internal.h"
#define MAX_CHANNELS 63
@@ -98,7 +99,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args0, void *opaque)
{
PanContext *const pan = ctx->priv;
char *arg, *arg0, *tokenizer, *args = av_strdup(args0);
- int out_ch_id, in_ch_id, len, named;
+ int out_ch_id, in_ch_id, len, named, ret;
int nb_in_channels[2] = { 0, 0 }; // number of unnamed and named input channels
double gain;
@@ -111,11 +112,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args0, void *opaque)
if (!args)
return AVERROR(ENOMEM);
arg = av_strtok(args, ":", &tokenizer);
- pan->out_channel_layout = av_get_channel_layout(arg);
- if (!pan->out_channel_layout) {
- av_log(ctx, AV_LOG_ERROR, "Unknown channel layout \"%s\"\n", arg);
- return AVERROR(EINVAL);
- }
+ ret = ff_parse_channel_layout(&pan->out_channel_layout, arg, ctx);
+ if (ret < 0)
+ return ret;
pan->nb_output_channels = av_get_channel_layout_nb_channels(pan->out_channel_layout);
/* parse channel specifications */
--
GitLab