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>

diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index 5d8a348..5e46fae 100644 (file)
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -32,6 +32,8 @@
 #include "avcodec.h"
 #include "audioconvert.h"
 
+#if FF_API_AUDIO_CONVERT
+
 struct AVAudioConvert {
     int in_channels, out_channels;
     int fmt_pair;
@@ -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 (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"
@@ -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 ac3af67..520a040 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -73,8 +73,11 @@
 #ifndef FF_API_CODEC_ID
 #define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_AUDIO_CONVERT
+#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 #ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
+#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
 #endif
 #ifndef FF_API_DEINTERLACE
 #define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)