diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:48:52 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:33 +0100 |
| commit | 7460398b8944bc7d3554b4cfa6cfd8f43a6e132f (patch) | |
| tree | 1139832830d84a8afdb34cb5526f0e7f477765b7 /libavcodec | |
| parent | 041cd5a0c55e02dd3b9a2419644b03103819c3d3 (diff) | |
| download | ffmpeg-7460398b8944bc7d3554b4cfa6cfd8f43a6e132f.tar.gz | |
lavc: remove the deprecated opt.h header.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/opt.h | 34 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 1 insertions, 38 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fbb8112eea..ef2aa9626f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1,7 +1,7 @@ NAME = avcodec FFLIBS = avutil -HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vda.h vdpau.h version.h xvmc.h +HEADERS = avcodec.h avfft.h dxva2.h vaapi.h vda.h vdpau.h version.h xvmc.h OBJS = allcodecs.o \ audioconvert.o \ diff --git a/libavcodec/opt.h b/libavcodec/opt.h deleted file mode 100644 index 2380e74332..0000000000 --- a/libavcodec/opt.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Libav is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * This header is provided for compatibility only and will be removed - * on next major bump - */ - -#ifndef AVCODEC_OPT_H -#define AVCODEC_OPT_H - -#include "libavcodec/version.h" - -#if FF_API_OPT_H -#include "libavutil/opt.h" -#endif - -#endif /* AVCODEC_OPT_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 5042f4dc54..e36cba88da 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -53,9 +53,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #endif -#ifndef FF_API_OPT_H -#define FF_API_OPT_H (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_THREAD_INIT #define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54) #endif |