lavc: drop deprecated audio_convert API at the next major bump

[ffmpeg] / libavcodec / audioconvert.h

diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index 61124b3a3289dd46c5bab3c17cc454a30491793c..556ab31058409c25be9c5effafabd672170d587f 100644 (file)
--- 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"
@@ -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 */