diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/audioconvert.h | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/audioconvert.h')
| -rw-r--r-- | ffmpeg/libavcodec/audioconvert.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ffmpeg/libavcodec/audioconvert.h b/ffmpeg/libavcodec/audioconvert.h index 61124b3..556ab31 100644 --- a/ffmpeg/libavcodec/audioconvert.h +++ b/ffmpeg/libavcodec/audioconvert.h @@ -26,8 +26,11 @@ /** * @file * Audio format conversion routines + * This interface is deprecated and will be dropped in a future + * version. You should use the libswresample library instead. */ +#if FF_API_AUDIO_CONVERT #include "libavutil/cpu.h" #include "avcodec.h" @@ -45,14 +48,20 @@ typedef struct AVAudioConvert AVAudioConvert; * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore. * @param flags See AV_CPU_FLAG_xx * @return NULL on error + * @deprecated See libswresample */ + +attribute_deprecated AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, enum AVSampleFormat in_fmt, int in_channels, const float *matrix, int flags); /** * Free audio sample format converter context + * @deprecated See libswresample */ + +attribute_deprecated void av_audio_convert_free(AVAudioConvert *ctx); /** @@ -62,9 +71,14 @@ void av_audio_convert_free(AVAudioConvert *ctx); * @param[in] in array of input buffers for each channel * @param[in] in_stride distance between consecutive input samples (measured in bytes) * @param len length of audio frame size (measured in samples) + * @deprecated See libswresample */ + +attribute_deprecated int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6], const int in_stride[6], int len); +#endif /* FF_API_AUDIO_CONVERT */ + #endif /* AVCODEC_AUDIOCONVERT_H */ |