diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-08-29 08:51:55 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-08-30 02:59:08 +0200 |
| commit | 3a76076513c7e817afba7f318b5f0ea20de40e5e (patch) | |
| tree | ddea8cfe728e869308b62d3b5f0f4b535f2e86b6 | |
| parent | c1d3b4705e2a6102416f5c53e83ad57ac6388390 (diff) | |
| download | ffmpeg-3a76076513c7e817afba7f318b5f0ea20de40e5e.tar.gz | |
avcodec/mss3: Cleanup generically after init failure
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavcodec/mss3.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index a301675ec2..74f4b5e671 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -844,19 +844,13 @@ static av_cold int mss3_decode_init(AVCodecContext *avctx) b_width * b_height); if (!c->dct_coder[i].prev_dc) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate buffer\n"); - while (i >= 0) { - av_freep(&c->dct_coder[i].prev_dc); - i--; - } return AVERROR(ENOMEM); } } c->pic = av_frame_alloc(); - if (!c->pic) { - mss3_decode_end(avctx); + if (!c->pic) return AVERROR(ENOMEM); - } avctx->pix_fmt = AV_PIX_FMT_YUV420P; @@ -875,4 +869,5 @@ AVCodec ff_msa1_decoder = { .close = mss3_decode_end, .decode = mss3_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; |