[FFmpeg-cvslog] avcodec/ffwavesynth: Cleanup generically after init failure
Andreas Rheinhardt
git at videolan.org
Fri Sep 18 04:10:50 EEST 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Sep 14 06:03:04 2020 +0200| [01506c290adb6d033e0167b95e52d37bc5ceedeb] | committer: Andreas Rheinhardt
avcodec/ffwavesynth: Cleanup generically after init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01506c290adb6d033e0167b95e52d37bc5ceedeb
---
libavcodec/ffwavesynth.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/libavcodec/ffwavesynth.c b/libavcodec/ffwavesynth.c
index d92bb38c45..c99bac90ea 100644
--- a/libavcodec/ffwavesynth.c
+++ b/libavcodec/ffwavesynth.c
@@ -323,13 +323,11 @@ static av_cold int wavesynth_init(AVCodecContext *avc)
r = wavesynth_parse_extradata(avc);
if (r < 0) {
av_log(avc, AV_LOG_ERROR, "Invalid intervals definitions.\n");
- goto fail;
+ return r;
}
ws->sin = av_malloc(sizeof(*ws->sin) << SIN_BITS);
- if (!ws->sin) {
- r = AVERROR(ENOMEM);
- goto fail;
- }
+ if (!ws->sin)
+ return AVERROR(ENOMEM);
for (i = 0; i < 1 << SIN_BITS; i++)
ws->sin[i] = floor(32767 * sin(2 * M_PI * i / (1 << SIN_BITS)));
ws->dither_state = MKTAG('D','I','T','H');
@@ -340,11 +338,6 @@ static av_cold int wavesynth_init(AVCodecContext *avc)
wavesynth_seek(ws, 0);
avc->sample_fmt = AV_SAMPLE_FMT_S16;
return 0;
-
-fail:
- av_freep(&ws->inter);
- av_freep(&ws->sin);
- return r;
}
static void wavesynth_synth_sample(struct wavesynth_context *ws, int64_t ts,
@@ -476,4 +469,5 @@ AVCodec ff_ffwavesynth_decoder = {
.close = wavesynth_close,
.decode = wavesynth_decode,
.capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};
More information about the ffmpeg-cvslog
mailing list