diff options
| author | Benjamin Larsson <banan@ludd.ltu.se> | 2008-11-01 20:49:37 +0000 |
|---|---|---|
| committer | Benjamin Larsson <banan@ludd.ltu.se> | 2008-11-01 20:49:37 +0000 |
| commit | 48dc2fb800e8e637fd8070ea2b1c8522574a34de (patch) | |
| tree | 6e1bd74d85bbfeb3e0fb745d2f7d82ff35a7b446 | |
| parent | 87c3b9bce34e1480a3d208df8b3fc13d6c3ed185 (diff) | |
| download | ffmpeg-48dc2fb800e8e637fd8070ea2b1c8522574a34de.tar.gz | |
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
| -rw-r--r-- | libavcodec/dca.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 3e465c46ee..0c6e865f7d 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; |