diff options
author | James Almer <jamrial@gmail.com> | 2023-04-12 14:18:50 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2023-05-04 18:15:00 -0300 |
commit | 599abc0f3a0c6a1d9746a3098cd444a45471a160 (patch) | |
tree | 651d3f6d2669c2b7f487cccb2e708a481d0213a9 /libavutil | |
parent | 3675dd0e0c8892151441a02ed0c5dee72a111c81 (diff) | |
download | ffmpeg-599abc0f3a0c6a1d9746a3098cd444a45471a160.tar.gz |
avutil/frame: deprecate interlaced_frame and top_field_first
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/frame.c | 4 | ||||
-rw-r--r-- | libavutil/frame.h | 8 | ||||
-rw-r--r-- | libavutil/version.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index f420a6e187..e544b690fe 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -275,8 +275,12 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) dst->pts = src->pts; dst->duration = src->duration; dst->repeat_pict = src->repeat_pict; +#if FF_API_INTERLACED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS dst->interlaced_frame = src->interlaced_frame; dst->top_field_first = src->top_field_first; +FF_ENABLE_DEPRECATION_WARNINGS +#endif dst->palette_has_changed = src->palette_has_changed; dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; diff --git a/libavutil/frame.h b/libavutil/frame.h index 125ba3aa35..095fc39c3f 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -491,15 +491,23 @@ typedef struct AVFrame { */ int repeat_pict; +#if FF_API_INTERLACED_FRAME /** * The content of the picture is interlaced. + * + * @deprecated Use AV_FRAME_FLAG_INTERLACED instead */ + attribute_deprecated int interlaced_frame; /** * If the content is interlaced, is top field displayed first. + * + * @deprecated Use AV_FRAME_FLAG_TOP_FIELD_FIRST instead */ + attribute_deprecated int top_field_first; +#endif /** * Tell user application that palette has changed from previous frame. diff --git a/libavutil/version.h b/libavutil/version.h index 40f92af055..6a5e2c4881 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -115,6 +115,7 @@ #define FF_API_FRAME_PICTURE_NUMBER (LIBAVUTIL_VERSION_MAJOR < 59) #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) /** * @} |