mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-19 07:05:53 +08:00
Merge commit '302554835e39b79b977ed60c9afe81b44590dfef'
* commit '302554835e39b79b977ed60c9afe81b44590dfef': lavc: Drop deprecated unused public members Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@@ -2349,15 +2349,6 @@ typedef struct AVCodecContext {
|
||||
int chromaoffset;
|
||||
#endif
|
||||
|
||||
#if FF_API_UNUSED_MEMBERS
|
||||
/**
|
||||
* Multiplied by qscale for each frame and added to scene_change_score.
|
||||
* - encoding: Set by user.
|
||||
* - decoding: unused
|
||||
*/
|
||||
attribute_deprecated int scenechange_factor;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Note: Value depends upon the compare function used for fullpel ME.
|
||||
* - encoding: Set by user.
|
||||
@@ -2707,9 +2698,6 @@ typedef struct AVCodecContext {
|
||||
#define FF_CODER_TYPE_AC 1
|
||||
#define FF_CODER_TYPE_RAW 2
|
||||
#define FF_CODER_TYPE_RLE 3
|
||||
#if FF_API_UNUSED_MEMBERS
|
||||
#define FF_CODER_TYPE_DEFLATE 4
|
||||
#endif /* FF_API_UNUSED_MEMBERS */
|
||||
/**
|
||||
* @deprecated use encoder private options instead
|
||||
*/
|
||||
@@ -2911,9 +2899,6 @@ typedef struct AVCodecContext {
|
||||
#define FF_DEBUG_DCT_COEFF 0x00000040
|
||||
#define FF_DEBUG_SKIP 0x00000080
|
||||
#define FF_DEBUG_STARTCODE 0x00000100
|
||||
#if FF_API_UNUSED_MEMBERS
|
||||
#define FF_DEBUG_PTS 0x00000200
|
||||
#endif /* FF_API_UNUSED_MEMBERS */
|
||||
#define FF_DEBUG_ER 0x00000400
|
||||
#define FF_DEBUG_MMCO 0x00000800
|
||||
#define FF_DEBUG_BUGS 0x00001000
|
||||
@@ -3022,9 +3007,6 @@ typedef struct AVCodecContext {
|
||||
#define FF_IDCT_ARM 7
|
||||
#define FF_IDCT_ALTIVEC 8
|
||||
#define FF_IDCT_SIMPLEARM 10
|
||||
#if FF_API_UNUSED_MEMBERS
|
||||
#define FF_IDCT_IPP 13
|
||||
#endif /* FF_API_UNUSED_MEMBERS */
|
||||
#define FF_IDCT_XVID 14
|
||||
#define FF_IDCT_SIMPLEARMV5TE 16
|
||||
#define FF_IDCT_SIMPLEARMV6 17
|
||||
|
Reference in New Issue
Block a user