summaryrefslogtreecommitdiff
path: root/libavcodec/audioconvert.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-06-13 22:33:13 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-06-13 22:33:13 +0000
commit7ca1295985b03034653c03f8f3bca9e00bcf8b83 (patch)
tree950d5bc16ce0dc0032bb75d0a709d0090265bb6b /libavcodec/audioconvert.c
parent4f909c76756d71387baea07a3b27c0159a648e5b (diff)
Do not guess the channel layout when getting its string value.
Originally committed as revision 19185 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/audioconvert.c')
-rw-r--r--libavcodec/audioconvert.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index 4555128630..91ea7abdc4 100644
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -124,9 +124,6 @@ void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels,
{
int i;
- if (channel_layout==0)
- channel_layout = avcodec_guess_channel_layout(nb_channels, CODEC_ID_NONE, NULL);
-
for (i=0; channel_layout_map[i].name; i++)
if (nb_channels == channel_layout_map[i].nb_channels &&
channel_layout == channel_layout_map[i].layout) {