virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/proresenc_kostya: Cleanup generically after init failure

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-02-08 11:30:00 +01:00
parent 321c31cfe6
commit 9d5810702c
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/proresenc_kostya.c
View File

@@ -1274,25 +1274,19 @@ static av_cold int encode_init(AVCodecContext *avctx)
} }
ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q)); ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q));
if (!ctx->slice_q) { if (!ctx->slice_q)
encode_close(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata)); ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata));
if (!ctx->tdata) { if (!ctx->tdata)
encode_close(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
for (j = 0; j < avctx->thread_count; j++) { for (j = 0; j < avctx->thread_count; j++) {
ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1) ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1)
* TRELLIS_WIDTH * TRELLIS_WIDTH
* sizeof(*ctx->tdata->nodes)); * sizeof(*ctx->tdata->nodes));
if (!ctx->tdata[j].nodes) { if (!ctx->tdata[j].nodes)
encode_close(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
for (i = min_quant; i < max_quant + 2; i++) { for (i = min_quant; i < max_quant + 2; i++) {
ctx->tdata[j].nodes[i].prev_node = -1; ctx->tdata[j].nodes[i].prev_node = -1;
ctx->tdata[j].nodes[i].bits = 0; ctx->tdata[j].nodes[i].bits = 0;
@@ -1415,5 +1409,5 @@ const AVCodec ff_prores_ks_encoder = {
}, },
.priv_class = &proresenc_class, .priv_class = &proresenc_class,
.profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles),
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
}; };