[FFmpeg-devel] [PATCH] lavc: drop deprecated audio_convert API at the next major bump

[Stefano Sabatini]

---
 libavcodec/audioconvert.c | 4 ++++
 libavcodec/audioconvert.h | 5 +++++
 libavcodec/version.h      | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index 5d8a348..491b963 100644
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -25,6 +25,8 @@
  * @author Michael Niedermayer <michaelni at gmx.at>
  */
 
+#if FF_API_AUDIO_CONVERT
+
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/libm.h"
@@ -114,3 +116,5 @@ if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\
     }
     return 0;
 }
+
+#endif /* FF_API_AUDIO_CONVERT */
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index 7e7a1bc..556ab31 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 */
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 7528362..3785a58 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -100,5 +100,8 @@
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_AUDIO_CONVERT
+#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 
 #endif /* AVCODEC_VERSION_H */
-- 
1.8.1.2