diff options
| author | James Almer <jamrial@gmail.com> | 2025-02-19 13:43:23 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2025-03-28 14:33:08 -0300 |
| commit | ebd6d07ab9493dd2703f73c137699920896993c9 (patch) | |
| tree | d1f26e7bdb67b3147b995e7dacca30859895ddf8 /libavcodec/decode.c | |
| parent | 10f199cfa5cc3bd9cc424fb99bd61a3e9890c143 (diff) | |
| download | ffmpeg-ebd6d07ab9493dd2703f73c137699920896993c9.tar.gz | |
avutil: remove deprecated FF_API_FRAME_PKT
Deprecated since 2023-03-20.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/decode.c')
| -rw-r--r-- | libavcodec/decode.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index d4f521ada9..c9d247513e 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -172,10 +172,6 @@ static int extract_packet_props(AVCodecInternal *avci, const AVPacket *pkt) av_packet_unref(avci->last_pkt_props); if (pkt) { ret = av_packet_copy_props(avci->last_pkt_props, pkt); -#if FF_API_FRAME_PKT - if (!ret) - avci->last_pkt_props->stream_index = pkt->size; // Needed for ff_decode_frame_props(). -#endif } return ret; } @@ -444,14 +440,6 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) frame->pkt_dts = pkt->dts; - if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { -#if FF_API_FRAME_PKT -FF_DISABLE_DEPRECATION_WARNINGS - if(!avctx->has_b_frames) - frame->pkt_pos = pkt->pos; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - } emms_c(); if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { @@ -507,10 +495,6 @@ FF_ENABLE_DEPRECATION_WARNINGS pkt->pts = AV_NOPTS_VALUE; pkt->dts = AV_NOPTS_VALUE; if (!(codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) { -#if FF_API_FRAME_PKT - // See extract_packet_props() comment. - avci->last_pkt_props->stream_index = avci->last_pkt_props->stream_index - consumed; -#endif avci->last_pkt_props->pts = AV_NOPTS_VALUE; avci->last_pkt_props->dts = AV_NOPTS_VALUE; } @@ -1480,12 +1464,6 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, frame->pts = pkt->pts; frame->duration = pkt->duration; -#if FF_API_FRAME_PKT -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pos = pkt->pos; - frame->pkt_size = pkt->size; -FF_ENABLE_DEPRECATION_WARNINGS -#endif ret = side_data_map(frame, pkt->side_data, pkt->side_data_elems, ff_sd_global_map); if (ret < 0) @@ -1535,11 +1513,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); if (ret < 0) return ret; -#if FF_API_FRAME_PKT -FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_size = pkt->stream_index; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } ret = fill_frame_props(avctx, frame); |