OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f909c7
)
Do not guess the channel layout when getting its string value.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 13 Jun 2009 22:33:13 +0000
(22:33 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 13 Jun 2009 22:33:13 +0000
(22:33 +0000)
Originally committed as revision 19185 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/audioconvert.c
patch
|
blob
|
history
diff --git
a/libavcodec/audioconvert.c
b/libavcodec/audioconvert.c
index
4555128
..
91ea7ab
100644
(file)
--- 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) {