forked from FFmpeg/FFmpeg
lavc: remove the deprecated opt.h header.
This commit is contained in:
parent
041cd5a0c5
commit
7460398b89
3 changed files with 1 additions and 38 deletions
|
@ -1,7 +1,7 @@
|
||||||
NAME = avcodec
|
NAME = avcodec
|
||||||
FFLIBS = avutil
|
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 \
|
OBJS = allcodecs.o \
|
||||||
audioconvert.o \
|
audioconvert.o \
|
||||||
|
|
|
@ -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 */
|
|
|
@ -53,9 +53,6 @@
|
||||||
#ifndef FF_API_REQUEST_CHANNELS
|
#ifndef FF_API_REQUEST_CHANNELS
|
||||||
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
|
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_OPT_H
|
|
||||||
#define FF_API_OPT_H (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_THREAD_INIT
|
#ifndef FF_API_THREAD_INIT
|
||||||
#define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
|
#define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue