eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 15:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavc/avcodec: only allocate the encoding frame for encoders

Browse Source 
And only when needed, i.e. for encoders using the simple API.
This commit is contained in:
Anton Khirnov
2022-03-23 14:17:57 +01:00
parent 7efa6418b8
commit 1c01dca144
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.c
View File

@@ -180,14 +180,12 @@ 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->es.in_frame = av_frame_alloc();
avci->in_pkt = av_packet_alloc(); avci->in_pkt = av_packet_alloc();
avci->last_pkt_props = av_packet_alloc(); avci->last_pkt_props = av_packet_alloc();
avci->pkt_props = av_fifo_alloc2(1, sizeof(*avci->last_pkt_props), avci->pkt_props = av_fifo_alloc2(1, sizeof(*avci->last_pkt_props),
AV_FIFO_FLAG_AUTO_GROW); AV_FIFO_FLAG_AUTO_GROW);
if (!avci->buffer_frame || !avci->buffer_pkt || if (!avci->buffer_frame || !avci->buffer_pkt ||
!avci->es.in_frame || !avci->in_pkt || !avci->in_pkt || !avci->last_pkt_props || !avci->pkt_props) {
!avci->last_pkt_props || !avci->pkt_props) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto free_and_end; goto free_and_end;
} }

7
libavcodec/encode.c
View File

@@ -412,6 +412,7 @@ int attribute_align_arg avcodec_receive_packet(AVCodecContext *avctx, AVPacket *
int ff_encode_preinit(AVCodecContext *avctx) int ff_encode_preinit(AVCodecContext *avctx)
{ {
AVCodecInternal *avci = avctx->internal;
int i; int i;
if (avctx->time_base.num <= 0 || avctx->time_base.den <= 0) { if (avctx->time_base.num <= 0 || avctx->time_base.den <= 0) {
@@ -563,5 +564,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (avctx->codec_descriptor->props & AV_CODEC_PROP_INTRA_ONLY) if (avctx->codec_descriptor->props & AV_CODEC_PROP_INTRA_ONLY)
avctx->internal->intra_only_flag = AV_PKT_FLAG_KEY; avctx->internal->intra_only_flag = AV_PKT_FLAG_KEY;
if (ffcodec(avctx->codec)->cb.encode) {
avci->es.in_frame = av_frame_alloc();
if (!avci->es.in_frame)
return AVERROR(ENOMEM);
}
return 0; return 0;
} }