[FFmpeg-cvslog] qsvdec: fix a memleak of async_fifo

Anton Khirnov git at videolan.org
Sat Jul 25 23:37:02 CEST 2015


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Jul 21 19:41:59 2015 +0200| [22522d9c2c69624fe4d81d61ee65a56610f22f1d] | committer: Anton Khirnov

qsvdec: fix a memleak of async_fifo

init() is called whenever format changes, so current code would leak the
fifo in this case.

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

 libavcodec/qsvdec.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 489375c..ef781d9 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -73,10 +73,12 @@ int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, mfxSession session)
     mfxVideoParam param = { { 0 } };
     int ret;
 
-    q->async_fifo = av_fifo_alloc((1 + q->async_depth) *
-                                  (sizeof(mfxSyncPoint) + sizeof(QSVFrame*)));
-    if (!q->async_fifo)
-        return AVERROR(ENOMEM);
+    if (!q->async_fifo) {
+        q->async_fifo = av_fifo_alloc((1 + q->async_depth) *
+                                      (sizeof(mfxSyncPoint) + sizeof(QSVFrame*)));
+        if (!q->async_fifo)
+            return AVERROR(ENOMEM);
+    }
 
     ret = qsv_init_session(avctx, q, session);
     if (ret < 0) {



More information about the ffmpeg-cvslog mailing list