virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

avcodec/decode: don't set last_pkt_props->size

Browse Source 
Use the opaque field instead to keep this value.
No functional change, but removes the hack that made the packet technically
invalid, allowing the safe usage of functions like av_packet_ref() on it
if required.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2022-12-04 18:30:34 -03:00
parent b1fdb0b347
commit 0afdc398ce
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/decode.c
View File

@ -140,7 +140,7 @@ static int extract_packet_props(AVCodecInternal *avci, const AVPacket *pkt)
if (pkt) { if (pkt) {
ret = av_packet_copy_props(avci->last_pkt_props, pkt); ret = av_packet_copy_props(avci->last_pkt_props, pkt);
if (!ret) if (!ret)
avci->last_pkt_props->size = pkt->size; // HACK: Needed for ff_decode_frame_props(). avci->last_pkt_props->opaque = (void *)(intptr_t)pkt->size; // Needed for ff_decode_frame_props().
} }
return ret; return ret;
} }
@ -469,7 +469,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
pkt->pts = AV_NOPTS_VALUE; pkt->pts = AV_NOPTS_VALUE;
pkt->dts = AV_NOPTS_VALUE; pkt->dts = AV_NOPTS_VALUE;
if (!(codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) { if (!(codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
avci->last_pkt_props->size -= consumed; // See extract_packet_props() comment. // See extract_packet_props() comment.
avci->last_pkt_props->opaque = (void *)((intptr_t)avci->last_pkt_props->opaque - consumed);
avci->last_pkt_props->pts = AV_NOPTS_VALUE; avci->last_pkt_props->pts = AV_NOPTS_VALUE;
avci->last_pkt_props->dts = AV_NOPTS_VALUE; avci->last_pkt_props->dts = AV_NOPTS_VALUE;
} }
@ -1284,7 +1285,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
frame->pts = pkt->pts; frame->pts = pkt->pts;
frame->pkt_pos = pkt->pos; frame->pkt_pos = pkt->pos;
frame->duration = pkt->duration; frame->duration = pkt->duration;
frame->pkt_size = pkt->size; frame->pkt_size = (int)(intptr_t)pkt->opaque;
for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
size_t size; size_t size;