diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-28 14:30:30 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-08-28 16:04:27 +0200 |
| commit | 2d40968dd3ff17b12f7c80dbfad409b14418e267 (patch) | |
| tree | 6ff95e01ae0ead9f83fc8f8cf3493ac24c4dd95b | |
| parent | cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a (diff) | |
| download | ffmpeg-2d40968dd3ff17b12f7c80dbfad409b14418e267.tar.gz | |
lavu: Drop deprecated audioconvert.h header
Deprecated in 11/2012.
| -rw-r--r-- | libavutil/Makefile | 1 | ||||
| -rw-r--r-- | libavutil/audioconvert.h | 6 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 9d81006921..17bd57e8b7 100644 --- 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 index 300a67cd3d..0000000000 --- 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 bcbf755c59..75a78258e7 100644 --- 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 |