From: banan <banan@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Sat, 1 Nov 2008 20:49:37 +0000 (+0000)
Subject: Guess channel layout based on the number of channels if a custom layout is specified... 
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/eb72e4059fb6ff0ed8f5c2bc7e723d3042fb6bc8

Guess channel layout based on the number of channels if a custom layout is specified in amode.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15766 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 3e465c46e..0c6e865f7 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1215,11 +1215,6 @@ static int dca_decode_frame(AVCodecContext * avctx,
     }
     if (s->amode<16)
         avctx->channel_layout = dca_core_channel_layout[s->amode];
-    else {
-        av_log(avctx, AV_LOG_ERROR, "Custom channel layouts not supported\n");
-        //Maybe just guess layout depending on the channel count
-        return -1;
-    }
 
     if (s->lfe) avctx->channel_layout |= CHANNEL_LOW_FREQUENCY;