virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/ffwavesynth: Cleanup generically after init failure

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-14 06:03:04 +02:00
parent 3d51f2a12c
commit 01506c290a
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/ffwavesynth.c
View File

@ -323,13 +323,11 @@ static av_cold int wavesynth_init(AVCodecContext *avc)
r = wavesynth_parse_extradata(avc); r = wavesynth_parse_extradata(avc);
if (r < 0) { if (r < 0) {
av_log(avc, AV_LOG_ERROR, "Invalid intervals definitions.\n"); av_log(avc, AV_LOG_ERROR, "Invalid intervals definitions.\n");
goto fail; return r;
} }
ws->sin = av_malloc(sizeof(*ws->sin) << SIN_BITS); ws->sin = av_malloc(sizeof(*ws->sin) << SIN_BITS);
if (!ws->sin) { if (!ws->sin)
r = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
for (i = 0; i < 1 << SIN_BITS; i++) for (i = 0; i < 1 << SIN_BITS; i++)
ws->sin[i] = floor(32767 * sin(2 * M_PI * i / (1 << SIN_BITS))); ws->sin[i] = floor(32767 * sin(2 * M_PI * i / (1 << SIN_BITS)));
ws->dither_state = MKTAG('D','I','T','H'); ws->dither_state = MKTAG('D','I','T','H');
@ -340,11 +338,6 @@ static av_cold int wavesynth_init(AVCodecContext *avc)
wavesynth_seek(ws, 0); wavesynth_seek(ws, 0);
avc->sample_fmt = AV_SAMPLE_FMT_S16; avc->sample_fmt = AV_SAMPLE_FMT_S16;
return 0; 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, static void wavesynth_synth_sample(struct wavesynth_context *ws, int64_t ts,
@ -476,4 +469,5 @@ AVCodec ff_ffwavesynth_decoder = {
.close = wavesynth_close, .close = wavesynth_close,
.decode = wavesynth_decode, .decode = wavesynth_decode,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
}; };