eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 21:55:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft

Browse Source
This commit is contained in:
Anton Khirnov
2013-02-23 08:20:12 +01:00
parent 0f24a3ca99
commit 3b0f586f07
4 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/avcodec.h
View File

@@ -656,12 +656,6 @@ typedef struct RcOverride{
#define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata.
#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS.
#if FF_API_MPV_GLOBAL_OPTS
#define CODEC_FLAG_CBP_RD 0x04000000 ///< Use rate distortion optimization for cbp.
#define CODEC_FLAG_QP_RD 0x08000000 ///< Use rate distortion optimization for qp selectioon.
#define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< Strictly enforce GOP size.
#define CODEC_FLAG2_SKIP_RD 0x00004000 ///< RD optimal MB level residual skipping
#endif
#define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
/* Unsupported options :
@@ -1276,22 +1270,6 @@ typedef struct AVCodecContext {
int b_frame_strategy;
#if FF_API_MPV_GLOBAL_OPTS
/**
* luma single coefficient elimination threshold
* - encoding: Set by user.
* - decoding: unused
*/
attribute_deprecated int luma_elim_threshold;
/**
* chroma single coeff elimination threshold
* - encoding: Set by user.
* - decoding: unused
*/
attribute_deprecated int chroma_elim_threshold;
#endif
/**
* qscale offset between IP and B-frames
* - encoding: Set by user.
@@ -1596,13 +1574,6 @@ typedef struct AVCodecContext {
attribute_deprecated int inter_threshold;
#endif
#if FF_API_MPV_GLOBAL_OPTS
/**
* @deprecated use mpegvideo private options instead
*/
attribute_deprecated int quantizer_noise_shaping;
#endif
/**
* Motion estimation threshold below which no motion estimation is
* performed, but instead the user specified motion vectors are used.