virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

avformat/chromaprint: Add deinit function

Browse Source 
Fixes memleaks in case the trailer is never written.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-22 01:52:23 +02:00
parent 4e135347a7
commit dd1975b0bb
1 changed files with 4 additions and 3 deletions

7
libavformat/chromaprint.c

@ -47,8 +47,10 @@ typedef struct ChromaprintMuxContext {
#endif
} ChromaprintMuxContext;
static void cleanup(ChromaprintMuxContext *cpr)
static void deinit(AVFormatContext *s)
{
ChromaprintMuxContext *const cpr = s->priv_data;
if (cpr->ctx) {
ff_lock_avformat();
chromaprint_free(cpr->ctx);
@ -107,7 +109,6 @@ static int write_header(AVFormatContext *s)
return 0;
fail:
cleanup(cpr);
return AVERROR(EINVAL);
}
@ -156,7 +157,6 @@ fail:
chromaprint_dealloc(fp);
if (enc_fp)
chromaprint_dealloc(enc_fp);
cleanup(cpr);
return ret;
}
@ -187,6 +187,7 @@ const AVOutputFormat ff_chromaprint_muxer = {
.write_header = write_header,
.write_packet = write_packet,
.write_trailer = write_trailer,
.deinit = deinit,
.flags = AVFMT_NOTIMESTAMPS,
.priv_class = &chromaprint_class,
};