RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-18 13:21:08 +00:00
Code Issues Projects Releases Wiki Activity

lavc/avcodec: only allocate decoding packets for decoders

Browse Source
This commit is contained in:
Anton Khirnov 2022-03-23 14:25:24 +01:00
parent c954cf1e1b
commit 2cb86cd00c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/avcodec.c
View File

@ -155,12 +155,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
avci->buffer_frame = av_frame_alloc(); avci->buffer_frame = av_frame_alloc();
avci->buffer_pkt = av_packet_alloc(); avci->buffer_pkt = av_packet_alloc();
avci->in_pkt = av_packet_alloc(); if (!avci->buffer_frame || !avci->buffer_pkt) {
avci->last_pkt_props = av_packet_alloc();
avci->pkt_props = av_fifo_alloc2(1, sizeof(*avci->last_pkt_props),
AV_FIFO_FLAG_AUTO_GROW);
if (!avci->buffer_frame || !avci->buffer_pkt ||
!avci->in_pkt || !avci->last_pkt_props || !avci->pkt_props) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto free_and_end; goto free_and_end;
} }

8
libavcodec/decode.c
View File

@ -1527,6 +1527,7 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
int ff_decode_preinit(AVCodecContext *avctx) int ff_decode_preinit(AVCodecContext *avctx)
{ {
AVCodecInternal *avci = avctx->internal;
int ret = 0; int ret = 0;
/* if the decoder init function was already called previously, /* if the decoder init function was already called previously,
@ -1605,6 +1606,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
avctx->export_side_data |= AV_CODEC_EXPORT_DATA_MVS; avctx->export_side_data |= AV_CODEC_EXPORT_DATA_MVS;
} }
avci->in_pkt = av_packet_alloc();
avci->last_pkt_props = av_packet_alloc();
avci->pkt_props = av_fifo_alloc2(1, sizeof(*avci->last_pkt_props),
AV_FIFO_FLAG_AUTO_GROW);
if (!avci->in_pkt || !avci->last_pkt_props || !avci->pkt_props)
return AVERROR(ENOMEM);
ret = decode_bsfs_init(avctx); ret = decode_bsfs_init(avctx);
if (ret < 0) if (ret < 0)
return ret; return ret;