lavu: Drop deprecated audioconvert.h header

Deprecated in 11/2012.

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 9d81006..17bd57e 100644 (file)
--- 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                                                      \

diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
deleted file mode 100644 (file)
index 300a67c..0000000
--- a/libavutil/audioconvert.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#include "version.h"
-
-#if FF_API_AUDIOCONVERT
-#include "channel_layout.h"
-#endif

diff --git a/libavutil/version.h b/libavutil/version.h
index bcbf755..75a7825 100644 (file)
--- 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