diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-08 12:13:31 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-11 19:38:41 +0100 |
| commit | 805d7414dcc0a0d4dc8796d8cb40e0c47e6bea36 (patch) | |
| tree | 36db7ec1fa8117605377820e38b8be8b29f564e8 | |
| parent | 71bd076b30d9975aebc33724d00095787b9da7d8 (diff) | |
| download | ffmpeg-805d7414dcc0a0d4dc8796d8cb40e0c47e6bea36.tar.gz | |
avcodec/cavsdec: Cleanup generically on init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/cavs.c | 4 | ||||
| -rw-r--r-- | libavcodec/cavsdec.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index e29d9c659b..5367c44248 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -812,10 +812,8 @@ av_cold int ff_cavs_init(AVCodecContext *avctx) h->cur.f = av_frame_alloc(); h->DPB[0].f = av_frame_alloc(); h->DPB[1].f = av_frame_alloc(); - if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) { - ff_cavs_end(avctx); + if (!h->cur.f || !h->DPB[0].f || !h->DPB[1].f) return AVERROR(ENOMEM); - } h->luma_scan[0] = 0; h->luma_scan[1] = 8; diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 894aa1b54a..54e1877bbd 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1319,4 +1319,5 @@ const AVCodec ff_cavs_decoder = { .decode = cavs_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = cavs_flush, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; |