From 06b62cb8f2886eb1baf60c3146f4c4cade31e369 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 28 Apr 2012 12:20:19 +0200 Subject: swr: move AudioConvert to header the next commits will need it Signed-off-by: Michael Niedermayer --- libswresample/audioconvert.c | 9 --------- libswresample/audioconvert.h | 11 +++++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'libswresample') diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c index 26cf471ab4..75c1311ddb 100644 --- a/libswresample/audioconvert.c +++ b/libswresample/audioconvert.c @@ -32,15 +32,6 @@ #include "audioconvert.h" -typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); - -struct AudioConvert { - int channels; - conv_func_type *conv_f; - const int *ch_map; - uint8_t silence[8]; ///< silence input sample -}; - #define CONV_FUNC_NAME(dst_fmt, src_fmt) conv_ ## src_fmt ## _to_ ## dst_fmt //FIXME rounding ? diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h index 6d09271b35..9f16caf6d7 100644 --- a/libswresample/audioconvert.h +++ b/libswresample/audioconvert.h @@ -33,8 +33,15 @@ #include "libavutil/cpu.h" #include "libavutil/audioconvert.h" -struct AudioConvert; -typedef struct AudioConvert AudioConvert; + +typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); + +typedef struct AudioConvert { + int channels; + conv_func_type *conv_f; + const int *ch_map; + uint8_t silence[8]; ///< silence input sample +}AudioConvert; /** * Create an audio sample format converter context -- cgit v1.2.3