aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-09-13 03:51:23 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-09-17 00:09:08 +0200
commitb128344dfcfcf167cd7f6b12b82fddc7efddc98d (patch)
tree0e0a36c90f705082ec664fb41d152c79c7011b41
parent657756c353526e8807a214770c54a5bcb903bcad (diff)
downloadffmpeg-b128344dfcfcf167cd7f6b12b82fddc7efddc98d.tar.gz
avcodec/vb: Cleanup generically after init failure
In other words: Set the FF_CODEC_CAP_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavcodec/vb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/vb.c b/libavcodec/vb.c
index d9c6b93a73..fe419c7663 100644
--- a/libavcodec/vb.c
+++ b/libavcodec/vb.c
@@ -262,11 +262,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
c->frame = av_mallocz(avctx->width * avctx->height);
c->prev_frame = av_mallocz(avctx->width * avctx->height);
- if (!c->frame || !c->prev_frame) {
- av_freep(&c->frame);
- av_freep(&c->prev_frame);
+ if (!c->frame || !c->prev_frame)
return AVERROR(ENOMEM);
- }
return 0;
}
@@ -291,4 +288,5 @@ AVCodec ff_vb_decoder = {
.close = decode_end,
.decode = decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};