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_mix.h | |
| parent | 3a0bac27b3c851924a5fbde5301a3ad6bf951aba (diff) | |
| parent | 074a00d192c0e749d677b008b337da42597e780f (diff) | |
| download | ffmpeg-249fca3df9f9790369d38aaa63c828c3e2a30936.tar.gz | |
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_mix.h')
| -rw-r--r-- | libavresample/audio_mix.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavresample/audio_mix.h b/libavresample/audio_mix.h index 4ccfc1fd28..5bae5ab6da 100644 --- a/libavresample/audio_mix.h +++ b/libavresample/audio_mix.h @@ -25,13 +25,12 @@ #include "libavutil/samplefmt.h" #include "avresample.h" +#include "internal.h" #include "audio_data.h" typedef void (mix_func)(uint8_t **src, void **matrix, int len, int out_ch, int in_ch); -typedef struct AudioMix AudioMix; - /** * Set mixing function if the parameters match. * |