lavu: Drop deprecated audioconvert.h header

Deprecated in 11/2012.

lavu: Drop deprecated audioconvert.h header
Deprecated in 11/2012.
2d40968d · Vittorio Giovara · cdfe45ad · 2d40968d · cdfe45ad · 2d40968d
隐藏空白更改
内联并排

Showing with 0 addition and 10 deletion

libavutil/Makefile libavutil/Makefile +0 -1

libavutil/audioconvert.h libavutil/audioconvert.h +0 -6

libavutil/version.h libavutil/version.h +0 -3

未找到文件。
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -4,7 +4,6 @@ HEADERS = adler32.h                                                     \
          aes.h                                                         \
          attributes.h                                                  \
          audio_fifo.h                                                  \
-          audioconvert.h                                                \
          avassert.h                                                    \
          avstring.h                                                    \
          avutil.h                                                      \

--- a/libavutil/audioconvert.h
+++ b/libavutil/audioconvert.h
-
-#include "version.h"
-
-#if FF_API_AUDIOCONVERT
-#include "channel_layout.h"
-#endif
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -81,9 +81,6 @@
 #ifndef FF_API_CONTEXT_SIZE
 #define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
-#ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_CPU_FLAG_MMX2
 #define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif