From 2d40968dd3ff17b12f7c80dbfad409b14418e267 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 28 Jul 2015 14:30:30 +0100 Subject: lavu: Drop deprecated audioconvert.h header Deprecated in 11/2012. --- libavutil/Makefile | 1 - libavutil/audioconvert.h | 6 ------ libavutil/version.h | 3 --- 3 files changed, 10 deletions(-) delete mode 100644 libavutil/audioconvert.h (limited to 'libavutil') 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 -- cgit v1.2.3