diff options
| author | Marton Balint <cus@passwd.hu> | 2023-01-28 18:36:22 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2023-02-13 00:37:50 +0100 |
| commit | 22960783978d9e0b6d4a4ed21f503bd24662aa7e (patch) | |
| tree | 676c54c183aec3576b70819c4e4c97f857c8bfab /libavutil | |
| parent | 8e2c1249044e9207c88c13764797676d403e3f57 (diff) | |
| download | ffmpeg-22960783978d9e0b6d4a4ed21f503bd24662aa7e.tar.gz | |
avutil/frame: deprecate AVFrame.coded_picture_number and display_picture_number
Their usefulness is questionable, very few decoders set them, and their type
should have been int64_t. A replacement field can be added later if a valid use
case is found.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 4 | ||||
| -rw-r--r-- | libavutil/frame.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 4d89c75dc8..9545477acc 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -294,8 +294,12 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif 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 e5c92a0ca8..2580269549 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -451,14 +451,18 @@ 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 3ad38110c1..11b4387f64 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 0 +#define LIBAVUTIL_VERSION_MINOR 1 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -112,6 +112,7 @@ #define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_PKT_DURATION (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_REORDERED_OPAQUE (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_FRAME_PICTURE_NUMBER (LIBAVUTIL_VERSION_MAJOR < 59) /** * @} |