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 /libavcodec/nvenc.c | |
| 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 'libavcodec/nvenc.c')
| -rw-r--r-- | libavcodec/nvenc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index ab42dc9690..8a28454042 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -166,7 +166,9 @@ static int nvenc_print_error(AVCodecContext *avctx, NVENCSTATUS err, typedef struct FrameData { int64_t pts; int64_t duration; +#if FF_API_REORDERED_OPAQUE int64_t reordered_opaque; +#endif void *frame_opaque; AVBufferRef *frame_opaque_ref; @@ -2203,7 +2205,11 @@ static void reorder_queue_enqueue(AVFifo *queue, const AVCodecContext *avctx, fd.pts = frame->pts; fd.duration = frame->duration; +#if FF_API_REORDERED_OPAQUE +FF_DISABLE_DEPRECATION_WARNINGS fd.reordered_opaque = frame->reordered_opaque; +FF_ENABLE_DEPRECATION_WARNINGS +#endif fd.frame_opaque = frame->opaque; fd.frame_opaque_ref = *opaque_ref; @@ -2222,7 +2228,11 @@ static int64_t reorder_queue_dequeue(AVFifo *queue, AVCodecContext *avctx, return AV_NOPTS_VALUE; if (pkt) { +#if FF_API_REORDERED_OPAQUE +FF_DISABLE_DEPRECATION_WARNINGS avctx->reordered_opaque = fd.reordered_opaque; +FF_ENABLE_DEPRECATION_WARNINGS +#endif pkt->duration = fd.duration; if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { |