diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:56:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:56:29 -0300 |
| commit | 0b79fdeb9a81b8a568c7efea1063352338f4aa5b (patch) | |
| tree | c14421786ae5d10d547e6e37a00d517a22e36856 | |
| parent | 400ecd8e4059e0d6c587915bca5e7e11858cca33 (diff) | |
| parent | cbebc3251bc2544b469e0dcb176bc04779d8866c (diff) | |
| download | ffmpeg-streaming-0b79fdeb9a81b8a568c7efea1063352338f4aa5b.zip ffmpeg-streaming-0b79fdeb9a81b8a568c7efea1063352338f4aa5b.tar.gz | |
Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'
* commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c':
lavc: Drop deprecated public symbols
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/avcodec.h | 23 | ||||
| -rw-r--r-- | libavcodec/internal.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 12 |
3 files changed, 0 insertions, 37 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8b32ed7..62775ed 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -844,13 +844,6 @@ typedef struct RcOverride{ float quality_factor; } RcOverride; -#if FF_API_MAX_BFRAMES -/** - * @deprecated there is no libavcodec-wide limit on the number of B-frames - */ -#define FF_MAX_B_FRAMES 16 -#endif - /* encoding support These flags can be passed in AVCodecContext.flags before initialization. Note: Not everything is supported yet. @@ -1218,12 +1211,6 @@ typedef struct RcOverride{ * Codec should fill in channel configuration and samplerate instead of container */ #define CODEC_CAP_CHANNEL_CONF AV_CODEC_CAP_CHANNEL_CONF -#if FF_API_NEG_LINESIZES -/** - * @deprecated no codecs use this capability - */ -#define CODEC_CAP_NEG_LINESIZES 0x0800 -#endif /** * Codec supports frame-level multithreading. */ @@ -1353,13 +1340,6 @@ typedef struct AVCPBProperties { uint64_t vbv_delay; } AVCPBProperties; -#if FF_API_QSCALE_TYPE -#define FF_QSCALE_TYPE_MPEG1 0 -#define FF_QSCALE_TYPE_MPEG2 1 -#define FF_QSCALE_TYPE_H264 2 -#define FF_QSCALE_TYPE_VP56 3 -#endif - /** * The decoder will keep a reference to the frame and may reuse it later. */ @@ -3079,9 +3059,6 @@ typedef struct AVCodecContext { #define FF_IDCT_IPP 13 #endif /* FF_API_UNUSED_MEMBERS */ #define FF_IDCT_XVID 14 -#if FF_API_IDCT_XVIDMMX -#define FF_IDCT_XVIDMMX 14 -#endif /* FF_API_IDCT_XVIDMMX */ #define FF_IDCT_SIMPLEARMV5TE 16 #define FF_IDCT_SIMPLEARMV6 17 #define FF_IDCT_FAAN 20 diff --git a/libavcodec/internal.h b/libavcodec/internal.h index f1d5202..e9aad91 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -80,12 +80,10 @@ #define FF_DEFAULT_QUANT_BIAS 999999 #endif -#if !FF_API_QSCALE_TYPE #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 #define FF_QSCALE_TYPE_H264 2 #define FF_QSCALE_TYPE_VP56 3 -#endif #define FF_SANE_NB_CHANNELS 64U diff --git a/libavcodec/version.h b/libavcodec/version.h index b0a90b8..4cfc66d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -57,27 +57,15 @@ #ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_QSCALE_TYPE -#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_MB_TYPE #define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_MAX_BFRAMES -#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58) -#endif -#ifndef FF_API_NEG_LINESIZES -#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_EMU_EDGE #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_UNUSED_MEMBERS #define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_IDCT_XVIDMMX -#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_INPUT_PRESERVED #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58) #endif |
