diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-20 13:13:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | 67e7f0b05eeee37eee1357769038270fda08fe32 (patch) | |
| tree | fe20b746c486b5e22667dbf4bd3bcf8cffb6b063 /libavcodec/libx264.c | |
| parent | b8fef7e9c520b3923b32813b6a82c154c74402dc (diff) | |
| download | ffmpeg-67e7f0b05eeee37eee1357769038270fda08fe32.tar.gz | |
avutil: remove deprecated FF_API_REORDERED_OPAQUE
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 10d646bd76..0997c4e134 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -54,9 +54,6 @@ #define MB_CEIL(x) MB_FLOOR((x) + (MB_SIZE - 1)) typedef struct X264Opaque { -#if FF_API_REORDERED_OPAQUE - int64_t reordered_opaque; -#endif int64_t wallclock; int64_t duration; @@ -512,11 +509,6 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, goto fail; } -#if FF_API_REORDERED_OPAQUE -FF_DISABLE_DEPRECATION_WARNINGS - opaque->reordered_opaque = frame->reordered_opaque; -FF_ENABLE_DEPRECATION_WARNINGS -#endif opaque->duration = frame->duration; opaque->wallclock = wallclock; if (ctx->export_side_data & AV_CODEC_EXPORT_DATA_PRFT) @@ -681,11 +673,6 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, out_opaque = pic_out.opaque; if (out_opaque >= x4->reordered_opaque && out_opaque < &x4->reordered_opaque[x4->nb_reordered_opaque]) { -#if FF_API_REORDERED_OPAQUE -FF_DISABLE_DEPRECATION_WARNINGS - ctx->reordered_opaque = out_opaque->reordered_opaque; -FF_ENABLE_DEPRECATION_WARNINGS -#endif wallclock = out_opaque->wallclock; pkt->duration = out_opaque->duration; @@ -700,11 +687,6 @@ FF_ENABLE_DEPRECATION_WARNINGS // Unexpected opaque pointer on picture output av_log(ctx, AV_LOG_ERROR, "Unexpected opaque pointer; " "this is a bug, please report it.\n"); -#if FF_API_REORDERED_OPAQUE -FF_DISABLE_DEPRECATION_WARNINGS - ctx->reordered_opaque = 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } switch (pic_out.i_type) { |