From 8aaab1113c00f2c90f3ce9ebe0c29af19cb155fd Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 10 Apr 2013 12:40:04 +0200
Subject: af_channelmap: ensure the output channel layout is valid.

---
 libavfilter/af_channelmap.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libavfilter/af_channelmap.c')

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index 2aac538..34d2457 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -270,6 +270,12 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
         }
         s->output_layout = fmt;
     }
+    if (!s->output_layout) {
+        av_log(ctx, AV_LOG_ERROR, "Output channel layout is not set and "
+               "cannot be guessed from the maps.\n");
+        return AVERROR(EINVAL);
+    }
+
     ff_add_channel_layout(&s->channel_layouts, s->output_layout);
 
     if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {
-- 
cgit v1.1