From fc6351d019047ecd8f2fcd0a5aadedfac9fc617b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 16 Nov 2011 08:00:31 +0100 Subject: swr: make audio convert code explicitely private. Only what's declared in libswresample/swresample.h is public. --- libswresample/audioconvert.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libswresample/audioconvert.c') 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}; -- cgit v1.2.1