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

Originally committed as revision 15766 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 3e465c4..0c6e865 100644 (file)
--- 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;