Browse Source
avcodec/atrac1: Cleanup generically after init failure
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>tags/n4.4
Andreas Rheinhardt
5 years ago
1 changed files with 1 additions and 2 deletions
Unified View
Diff Options
-
+1 -2libavcodec/atrac1.c
+ 1
- 2
libavcodec/atrac1.c
View File
| @@ -353,7 +353,6 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) | |||||
| (ret = ff_mdct_init(&q->mdct_ctx[1], 8, 1, -1.0/ (1 << 15))) || | (ret = ff_mdct_init(&q->mdct_ctx[1], 8, 1, -1.0/ (1 << 15))) || | ||||
| (ret = ff_mdct_init(&q->mdct_ctx[2], 9, 1, -1.0/ (1 << 15)))) { | (ret = ff_mdct_init(&q->mdct_ctx[2], 9, 1, -1.0/ (1 << 15)))) { | ||||
| av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); | av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); | ||||
| atrac1_decode_end(avctx); | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -363,7 +362,6 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) | |||||
| q->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); | q->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); | ||||
| if (!q->fdsp) { | if (!q->fdsp) { | ||||
| atrac1_decode_end(avctx); | |||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| } | } | ||||
| @@ -393,4 +391,5 @@ AVCodec ff_atrac1_decoder = { | |||||
| .capabilities = AV_CODEC_CAP_DR1, | .capabilities = AV_CODEC_CAP_DR1, | ||||
| .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, | .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, | ||||
| AV_SAMPLE_FMT_NONE }, | AV_SAMPLE_FMT_NONE }, | ||||
| .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, | |||||
| }; | }; | ||||