RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/decode: stop mangling last_pkt_props->opaque 

It is currently abused to store packet size, which breaks
AV_CODEC_FLAG_COPY_OPAQUE.

Use stream_index instead, which is unused in libavcodec and has the
same type as size.

Found-by: Martin Storsjö
This commit is contained in:
Anton Khirnov 2023-03-09 16:02:31 +01:00
parent 205117d87f
commit a3bf63c26e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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->opaque = (void *)(intptr_t)pkt->size; // Needed for ff_decode_frame_props(). avci->last_pkt_props->stream_index = pkt->size; // Needed for ff_decode_frame_props().
} }
return ret; return ret;
} }
@ -461,7 +461,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
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)) {
// 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->stream_index = avci->last_pkt_props->stream_index - 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;
} }
@ -1355,7 +1355,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
int ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); int ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
frame->pkt_size = (int)(intptr_t)pkt->opaque; frame->pkt_size = pkt->stream_index;
} }
#if FF_API_REORDERED_OPAQUE #if FF_API_REORDERED_OPAQUE
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS