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_data.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_data.h')
-rw-r--r-- | libavresample/audio_data.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavresample/audio_data.h b/libavresample/audio_data.h index 558e7e67ec..97236bb5de 100644 --- a/libavresample/audio_data.h +++ b/libavresample/audio_data.h @@ -27,11 +27,12 @@ #include "libavutil/log.h" #include "libavutil/samplefmt.h" #include "avresample.h" +#include "internal.h" /** * Audio buffer used for intermediate storage between conversion phases. */ -typedef struct AudioData { +struct AudioData { const AVClass *class; /**< AVClass for logging */ uint8_t *data[AVRESAMPLE_MAX_CHANNELS]; /**< data plane pointers */ uint8_t *buffer; /**< data buffer */ @@ -50,7 +51,7 @@ typedef struct AudioData { int ptr_align; /**< minimum data pointer alignment */ int samples_align; /**< allocated samples alignment */ const char *name; /**< name for debug logging */ -} AudioData; +}; int ff_audio_data_set_channels(AudioData *a, int channels); @@ -117,9 +118,10 @@ void ff_audio_data_free(AudioData **a); * * @param out output AudioData * @param in input AudioData + * @param map channel map, NULL if not remapping * @return 0 on success, negative AVERROR value on error */ -int ff_audio_data_copy(AudioData *out, AudioData *in); +int ff_audio_data_copy(AudioData *out, AudioData *in, ChannelMapInfo *map); /** * Append data from one AudioData to the end of another. |