diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-03-09 16:02:31 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-03-11 11:41:45 +0100 |
| commit | adb4688bfb0652b2ffa5bc29e53761e27e1a3b3e (patch) | |
| tree | 4ad4639cdde90713d482ed01da39d838815a4216 | |
| parent | 916bdc0f197de7ea24d30f3f3c284e4332dd3720 (diff) | |
| download | ffmpeg-adb4688bfb0652b2ffa5bc29e53761e27e1a3b3e.tar.gz | |
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ö
(cherry picked from commit a3bf63c26e6197a9b6e490538667368530a9dcd3)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/decode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index be2be81089..d1ba7f167f 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -140,7 +140,7 @@ static int extract_packet_props(AVCodecInternal *avci, const AVPacket *pkt) if (pkt) { ret = av_packet_copy_props(avci->last_pkt_props, pkt); 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; } @@ -461,7 +461,7 @@ FF_ENABLE_DEPRECATION_WARNINGS pkt->dts = AV_NOPTS_VALUE; if (!(codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) { // 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->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); if (ret < 0) return ret; - frame->pkt_size = (int)(intptr_t)pkt->opaque; + frame->pkt_size = pkt->stream_index; } #if FF_API_REORDERED_OPAQUE FF_DISABLE_DEPRECATION_WARNINGS |