diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-01-31 12:27:28 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-02-04 13:40:20 +0100 |
| commit | bdc76f467f5caaa15b3bd11cbe6c52cc8f2f45b1 (patch) | |
| tree | bd2d15177f5ffc9681d609be283826eaa721b041 /libavutil | |
| parent | d02340b9e3e72f401cddbeb3bcc3cb584902b886 (diff) | |
| download | ffmpeg-bdc76f467f5caaa15b3bd11cbe6c52cc8f2f45b1.tar.gz | |
lavu/frame: deprecate reordered_opaque
It is only used in libavcodec, where it's been superseded by
AV_CODEC_CAP_COPY_OPAQUE.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 4 | ||||
| -rw-r--r-- | libavutil/frame.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index fa9b11aa54..2d81de8b0d 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -304,7 +304,11 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif dst->time_base = src->time_base; +#if FF_API_REORDERED_OPAQUE +FF_DISABLE_DEPRECATION_WARNINGS dst->reordered_opaque = src->reordered_opaque; +FF_ENABLE_DEPRECATION_WARNINGS +#endif dst->quality = src->quality; dst->best_effort_timestamp = src->best_effort_timestamp; dst->coded_picture_number = src->coded_picture_number; diff --git a/libavutil/frame.h b/libavutil/frame.h index bbe909ee2d..911af515f4 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -491,6 +491,7 @@ typedef struct AVFrame { */ int palette_has_changed; +#if FF_API_REORDERED_OPAQUE /** * reordered opaque 64 bits (generally an integer or a double precision float * PTS but can be anything). @@ -498,8 +499,12 @@ typedef struct AVFrame { * that time, * the decoder reorders values as needed and sets AVFrame.reordered_opaque * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque + * + * @deprecated Use AV_CODEC_FLAG_COPY_OPAQUE instead */ + attribute_deprecated int64_t reordered_opaque; +#endif /** * Sample rate of the audio data. diff --git a/libavutil/version.h b/libavutil/version.h index 60f96af5df..43daf8cd5a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -115,6 +115,7 @@ #define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_PKT_DURATION (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_REORDERED_OPAQUE (LIBAVUTIL_VERSION_MAJOR < 59) /** * @} |