[FFmpeg-cvslog] avcodec/kgv1dec: fix memleak, reintroduce lost decode_flush() call

Michael Niedermayer git at videolan.org
Fri Jan 17 02:53:26 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 02:43:26 2014 +0100| [d0004a1959ec200bad16c7e6cc03b83c17d66cfe] | committer: Michael Niedermayer

avcodec/kgv1dec: fix memleak, reintroduce lost decode_flush() call

fixes regression since 80d44190c4d909e9685d04bcde693da3e2441dfd and 1a0370ad94de094a5ac754e790d4ec8d8d0d9ee7
this reverts the buggy changes in these 2 commits

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0004a1959ec200bad16c7e6cc03b83c17d66cfe
---

 libavcodec/kgv1dec.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c
index 0c58bad..edbc2b2 100644
--- a/libavcodec/kgv1dec.c
+++ b/libavcodec/kgv1dec.c
@@ -167,6 +167,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
     return 0;
 }
 
+static av_cold int decode_end(AVCodecContext *avctx)
+{
+    decode_flush(avctx);
+    return 0;
+}
+
 AVCodec ff_kgv1_decoder = {
     .name           = "kgv1",
     .long_name      = NULL_IF_CONFIG_SMALL("Kega Game Video"),
@@ -174,6 +180,7 @@ AVCodec ff_kgv1_decoder = {
     .id             = AV_CODEC_ID_KGV1,
     .priv_data_size = sizeof(KgvContext),
     .init           = decode_init,
+    .close          = decode_end,
     .decode         = decode_frame,
     .flush          = decode_flush,
     .capabilities   = CODEC_CAP_DR1,



More information about the ffmpeg-cvslog mailing list