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().
pull/5/head
Justin Ruggles 13 years ago
parent 5cc51a5847
commit bb0618e68b
  1. 14
      libavcodec/audioconvert.c
  2. 9
      libavcodec/audioconvert.h

@ -31,20 +31,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "audioconvert.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 { struct AVAudioConvert {
int in_channels, out_channels; int in_channels, out_channels;
int fmt_pair; int fmt_pair;

@ -33,15 +33,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
/**
* Guess the channel layout
* @param nb_channels
* @param codec_id Codec identifier, or CODEC_ID_NONE if unknown
* @param fmt_name Format name, or NULL if unknown
* @return Channel layout mask
*/
uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
struct AVAudioConvert; struct AVAudioConvert;
typedef struct AVAudioConvert AVAudioConvert; typedef struct AVAudioConvert AVAudioConvert;

Loading…
Cancel
Save