Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
> ---
> 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,
> };
>
Will apply the rest of this patchset tomorrow if there are no objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
