summaryrefslogtreecommitdiff
path: root/libavcodec/audioconvert.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/audioconvert.c')
-rw-r--r--libavcodec/audioconvert.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index c48fbb74c5..2cf36bd1ab 100644
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -31,23 +31,6 @@
#include "avcodec.h"
#include "audioconvert.h"
-#if FF_API_OLD_SAMPLE_FMT
-const char *avcodec_get_sample_fmt_name(int sample_fmt)
-{
- return av_get_sample_fmt_name(sample_fmt);
-}
-
-enum AVSampleFormat avcodec_get_sample_fmt(const char* name)
-{
- return av_get_sample_fmt(name);
-}
-
-void avcodec_sample_fmt_string (char *buf, int buf_size, int sample_fmt)
-{
- av_get_sample_fmt_string(buf, buf_size, sample_fmt);
-}
-#endif
-
uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name)
{
switch(nb_channels) {
@@ -62,23 +45,6 @@ uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, co
}
}
-#if FF_API_OLD_AUDIOCONVERT
-int64_t avcodec_get_channel_layout(const char *name)
-{
- return av_get_channel_layout(name);
-}
-
-void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout)
-{
- av_get_channel_layout_string(buf, buf_size, nb_channels, channel_layout);
-}
-
-int avcodec_channel_layout_num_channels(int64_t channel_layout)
-{
- return av_get_channel_layout_nb_channels(channel_layout);
-}
-#endif
-
struct AVAudioConvert {
int in_channels, out_channels;
int fmt_pair;