[FFmpeg-cvslog] avformat/segafilmenc: Add deinit function
Andreas Rheinhardt
git at videolan.org
Tue Feb 25 20:57:55 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Jan 14 04:13:36 2020 +0100| [da304e78b5175cb45b06116006e1901cef077ffd] | committer: Michael Niedermayer
avformat/segafilmenc: Add deinit function
Prevents memleaks when the trailer is never written or when shifting the
data fails when writing the trailer.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da304e78b5175cb45b06116006e1901cef077ffd
---
libavformat/segafilmenc.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libavformat/segafilmenc.c b/libavformat/segafilmenc.c
index 7778609e9a..93c482ef7d 100644
--- a/libavformat/segafilmenc.c
+++ b/libavformat/segafilmenc.c
@@ -360,10 +360,23 @@ static int film_write_header(AVFormatContext *format_context)
packet = packet->next;
av_freep(&prev);
}
+ film->start = film->last = NULL;
return 0;
}
+static void film_deinit(AVFormatContext *format_context)
+{
+ FILMOutputContext *film = format_context->priv_data;
+ FILMPacket *packet = film->start;
+ while (packet != NULL) {
+ FILMPacket *next = packet->next;
+ av_free(packet);
+ packet = next;
+ }
+ film->start = film->last = NULL;
+}
+
AVOutputFormat ff_segafilm_muxer = {
.name = "film_cpk",
.long_name = NULL_IF_CONFIG_SMALL("Sega FILM / CPK"),
@@ -374,4 +387,5 @@ AVOutputFormat ff_segafilm_muxer = {
.init = film_init,
.write_trailer = film_write_header,
.write_packet = film_write_packet,
+ .deinit = film_deinit,
};
More information about the ffmpeg-cvslog
mailing list