diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 12:56:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 12:56:41 +0100 |
| commit | 249fca3df9f9790369d38aaa63c828c3e2a30936 (patch) | |
| tree | fe8f3784cc3160505617bf76b32534c4b5367658 /libavresample/audio_convert.h | |
| parent | 3a0bac27b3c851924a5fbde5301a3ad6bf951aba (diff) | |
| parent | 074a00d192c0e749d677b008b337da42597e780f (diff) | |
Merge commit '074a00d192c0e749d677b008b337da42597e780f'
* commit '074a00d192c0e749d677b008b337da42597e780f':
lavr: add a public function for setting a custom channel map
lavr: typedef internal structs in internal.h
doc: Extend commit message section
Conflicts:
doc/APIchanges
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.h')
| -rw-r--r-- | libavresample/audio_convert.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavresample/audio_convert.h b/libavresample/audio_convert.h index b8808f176d..6a3089d4fb 100644 --- a/libavresample/audio_convert.h +++ b/libavresample/audio_convert.h @@ -23,10 +23,9 @@ #include "libavutil/samplefmt.h" #include "avresample.h" +#include "internal.h" #include "audio_data.h" -typedef struct AudioConvert AudioConvert; - /** * Set conversion function if the parameters match. * @@ -59,12 +58,14 @@ void ff_audio_convert_set_func(AudioConvert *ac, enum AVSampleFormat out_fmt, * @param in_fmt input sample format * @param channels number of channels * @param sample_rate sample rate (used for dithering) + * @param apply_map apply channel map during conversion * @return newly-allocated AudioConvert context */ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt, - int channels, int sample_rate); + int channels, int sample_rate, + int apply_map); /** * Free AudioConvert. |