summaryrefslogtreecommitdiff
path: root/libswresample/audioconvert.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-16 08:00:31 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-17 10:16:07 +0100
commitfc6351d019047ecd8f2fcd0a5aadedfac9fc617b (patch)
tree9879135649454708882d652ea23f34d578240b79 /libswresample/audioconvert.c
parent3a5fc3857435ee1653379e4c8e60d254563a82c9 (diff)
downloadffmpeg-fc6351d019047ecd8f2fcd0a5aadedfac9fc617b.tar.gz
swr: make audio convert code explicitely private.
Only what's declared in libswresample/swresample.h is public.
Diffstat (limited to 'libswresample/audioconvert.c')
-rw-r--r--libswresample/audioconvert.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c
index 268d27681b..845c9c0caa 100644
--- a/libswresample/audioconvert.c
+++ b/libswresample/audioconvert.c
@@ -34,7 +34,7 @@
typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);
-struct AVAudioConvert {
+struct AudioConvert {
int channels;
conv_func_type *conv_f;
const int *ch_map;
@@ -108,17 +108,17 @@ conv_func_type *fmt_pair_to_conv_functions[AV_SAMPLE_FMT_NB*AV_SAMPLE_FMT_NB] =
FMT_PAIR_FUNC(AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBL),
};
-AVAudioConvert *swr_audio_convert_alloc(enum AVSampleFormat out_fmt,
- enum AVSampleFormat in_fmt,
- int channels, const int *ch_map,
- int flags)
+AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
+ enum AVSampleFormat in_fmt,
+ int channels, const int *ch_map,
+ int flags)
{
- AVAudioConvert *ctx;
+ AudioConvert *ctx;
conv_func_type *f = fmt_pair_to_conv_functions[out_fmt + AV_SAMPLE_FMT_NB*in_fmt];
if (!f)
return NULL;
- ctx = av_malloc(sizeof(AVAudioConvert));
+ ctx = av_malloc(sizeof(*ctx));
if (!ctx)
return NULL;
ctx->channels = channels;
@@ -127,12 +127,12 @@ AVAudioConvert *swr_audio_convert_alloc(enum AVSampleFormat out_fmt,
return ctx;
}
-void swr_audio_convert_free(AVAudioConvert **ctx)
+void swri_audio_convert_free(AudioConvert **ctx)
{
av_freep(ctx);
}
-int swr_audio_convert(AVAudioConvert *ctx, AudioData *out, AudioData*in, int len)
+int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len)
{
int ch;
const uint8_t null_input[8] = {0};