diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 12:20:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 13:02:58 +0200 |
| commit | 06b62cb8f2886eb1baf60c3146f4c4cade31e369 (patch) | |
| tree | 0bfb151a6ed5f757c0853e108cff12a813e9eb1a /libswresample | |
| parent | edbde5222688c18eecd7a589779aa8696b64a6ab (diff) | |
| download | ffmpeg-06b62cb8f2886eb1baf60c3146f4c4cade31e369.tar.gz | |
swr: move AudioConvert to header
the next commits will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/audioconvert.c | 9 | ||||
| -rw-r--r-- | libswresample/audioconvert.h | 11 |
2 files changed, 9 insertions, 11 deletions
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 |