From bb0618e68b31db3ee8b572a39c2bb98d64338d52 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 21 Mar 2012 20:39:02 -0400 Subject: avcodec: remove avcodec_guess_channel_layout() It is not public because the header is not installed, and its functionality has been replaced by av_get_default_channel_layout(). --- libavcodec/audioconvert.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'libavcodec/audioconvert.c') diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 0e1160d8e3..112e22096b 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -31,20 +31,6 @@ #include "avcodec.h" #include "audioconvert.h" -uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name) -{ - switch(nb_channels) { - case 1: return AV_CH_LAYOUT_MONO; - case 2: return AV_CH_LAYOUT_STEREO; - case 3: return AV_CH_LAYOUT_SURROUND; - case 4: return AV_CH_LAYOUT_QUAD; - case 5: return AV_CH_LAYOUT_5POINT0; - case 6: return AV_CH_LAYOUT_5POINT1; - case 8: return AV_CH_LAYOUT_7POINT1; - default: return 0; - } -} - struct AVAudioConvert { int in_channels, out_channels; int fmt_pair; -- cgit v1.2.3