diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-08 11:30:00 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-11 19:38:40 +0100 |
| commit | 9d5810702c47369913f4616d3dd7c83f01ec754a (patch) | |
| tree | 8b313fdd308e6a2bc88827b9cf578dbd1ce0f7bb | |
| parent | 321c31cfe632cf7763e2e09765d59f1ab40abf3a (diff) | |
| download | ffmpeg-9d5810702c47369913f4616d3dd7c83f01ec754a.tar.gz | |
avcodec/proresenc_kostya: Cleanup generically after init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 85651fce2a..08a874dd4e 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -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)); - if (!ctx->slice_q) { - encode_close(avctx); + if (!ctx->slice_q) return AVERROR(ENOMEM); - } ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata)); - if (!ctx->tdata) { - encode_close(avctx); + if (!ctx->tdata) return AVERROR(ENOMEM); - } for (j = 0; j < avctx->thread_count; j++) { ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1) * TRELLIS_WIDTH * sizeof(*ctx->tdata->nodes)); - if (!ctx->tdata[j].nodes) { - encode_close(avctx); + if (!ctx->tdata[j].nodes) return AVERROR(ENOMEM); - } for (i = min_quant; i < max_quant + 2; i++) { ctx->tdata[j].nodes[i].prev_node = -1; ctx->tdata[j].nodes[i].bits = 0; @@ -1415,5 +1409,5 @@ const AVCodec ff_prores_ks_encoder = { }, .priv_class = &proresenc_class, .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, }; |