diff options
| author | James Almer <jamrial@gmail.com> | 2023-04-12 20:07:01 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-05-04 19:20:03 -0300 |
| commit | 3e06f6f04020bef32fa42bc9d7f96e76a46453aa (patch) | |
| tree | 3cb4509342f7f7fcbc5c0cf20faf4fc3f90202e8 /libavutil | |
| parent | c7a8681860d68f3ad00ef49215dbfda52c71c90b (diff) | |
| download | ffmpeg-3e06f6f04020bef32fa42bc9d7f96e76a46453aa.tar.gz | |
avutil/frame: deprecate key_frame
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 5 | ||||
| -rw-r--r-- | libavutil/frame.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index e544b690fe..97d40208c8 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -55,7 +55,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif frame->time_base = (AVRational){ 0, 1 }; - frame->key_frame = 1; frame->sample_aspect_ratio = (AVRational){ 0, 1 }; frame->format = -1; /* unknown */ frame->extended_data = frame->data; @@ -265,7 +264,11 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { int ret; +#if FF_API_FRAME_KEY +FF_DISABLE_DEPRECATION_WARNINGS dst->key_frame = src->key_frame; +FF_ENABLE_DEPRECATION_WARNINGS +#endif dst->pict_type = src->pict_type; dst->sample_aspect_ratio = src->sample_aspect_ratio; dst->crop_top = src->crop_top; diff --git a/libavutil/frame.h b/libavutil/frame.h index 61a218268e..f2b56beebb 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -416,10 +416,15 @@ typedef struct AVFrame { */ int format; +#if FF_API_FRAME_KEY /** * 1 -> keyframe, 0-> not + * + * @deprecated Use AV_FRAME_FLAG_KEY instead */ + attribute_deprecated int key_frame; +#endif /** * Picture type of the frame. diff --git a/libavutil/version.h b/libavutil/version.h index 6a5e2c4881..3a4b9ca77c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -116,6 +116,7 @@ #define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 59) /** * @} |