diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:18:05 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:18:05 +0200 |
| commit | d9218011ef411c56073f63629842a1fa26454c75 (patch) | |
| tree | aafe875fa4ed3d0f76ebce72394010685b9d39bd | |
| parent | d96d0252fd535db5183492b804341cba93468b15 (diff) | |
| parent | 2d40968dd3ff17b12f7c80dbfad409b14418e267 (diff) | |
| download | ffmpeg-d9218011ef411c56073f63629842a1fa26454c75.tar.gz | |
Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267'
* commit '2d40968dd3ff17b12f7c80dbfad409b14418e267':
lavu: Drop deprecated audioconvert.h header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -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 b76bcde9e0..74397501a2 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -6,7 +6,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 37274c3672..13ed433958 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -90,9 +90,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 |