OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87c3b9b
)
Guess channel layout based on the number of channels if a custom layout is specified...
author
Benjamin Larsson
<banan@ludd.ltu.se>
Sat, 1 Nov 2008 20:49:37 +0000
(20:49 +0000)
committer
Benjamin Larsson
<banan@ludd.ltu.se>
Sat, 1 Nov 2008 20:49:37 +0000
(20:49 +0000)
Originally committed as revision 15766 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/dca.c
patch
|
blob
|
history
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;