diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-20 13:31:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | 583cf2a86990a64e2a83981b1faec0fb448d899a (patch) | |
| tree | da1799851e2a209a4e07e80672038b600dd155b9 /libavutil | |
| parent | 67e7f0b05eeee37eee1357769038270fda08fe32 (diff) | |
avutil: remove deprecated FF_API_FRAME_PICTURE_NUMBER
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 6 | ||||
| -rw-r--r-- | libavutil/frame.h | 13 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
3 files changed, 0 insertions, 20 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 93ac3a753d..079cf6595b 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -268,12 +268,6 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->time_base = src->time_base; dst->quality = src->quality; dst->best_effort_timestamp = src->best_effort_timestamp; -#if FF_API_FRAME_PICTURE_NUMBER -FF_DISABLE_DEPRECATION_WARNINGS - dst->coded_picture_number = src->coded_picture_number; - dst->display_picture_number = src->display_picture_number; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->flags = src->flags; dst->decode_error_flags = src->decode_error_flags; dst->color_primaries = src->color_primaries; diff --git a/libavutil/frame.h b/libavutil/frame.h index 3186d3a872..b94687941d 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -466,19 +466,6 @@ typedef struct AVFrame { */ AVRational time_base; -#if FF_API_FRAME_PICTURE_NUMBER - /** - * picture number in bitstream order - */ - attribute_deprecated - int coded_picture_number; - /** - * picture number in display order - */ - attribute_deprecated - int display_picture_number; -#endif - /** * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) */ diff --git a/libavutil/version.h b/libavutil/version.h index 2eaf57cde2..117e4e6020 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#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) |