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

Originally committed as revision 15766 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benjamin Larsson 2008-11-01 20:49:37 +00:00
parent 87c3b9bce3
commit 48dc2fb800

View File

@ -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;