Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-10-31 13:38:10 +0400
committerStefano Sabatini <stefasab@gmail.com>2013-11-03 16:13:24 +0400
commit5a6e6dcaa4d237257592fbe621fa9325ac860ba0 (patch)
tree5d56406124de8ca9bf9537d03f12ce34a04eca39 /libavcodec/audioconvert.h
parentcf49d5907aae5b7be4d0e3e30d12bf85a2fa87f3 (diff)
lavc: drop deprecated audio_convert API at the next major bump
Also make AVCODEC_RESAMPLE API removal depends on its presence, since its code depends on it as well. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Diffstat (limited to 'libavcodec/audioconvert.h')
-rw-r--r--libavcodec/audioconvert.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index 7e7a1bc45f..556ab31058 100644
--- a/libavcodec/audioconvert.h
+++ b/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"
@@ -76,4 +79,6 @@ 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 */