[FFmpeg-cvslog] Merge commit 'f2e9a0ecbef5027f9532c49ffcdfc11d199f6150'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Dec 14 18:46:43 2017 -0300| [b4718b76937a6677ce89866e06d929d778c57b64] | committer: James Almer

Merge commit 'f2e9a0ecbef5027f9532c49ffcdfc11d199f6150'

* commit 'f2e9a0ecbef5027f9532c49ffcdfc11d199f6150':
  qsv/vp8dec: fixes memory leak issue

Merged-by: James Almer <jamrial at gmail.com>

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

 libavcodec/qsvdec_other.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c
index 416e4c8164..3c872dcfc2 100644
--- a/libavcodec/qsvdec_other.c
+++ b/libavcodec/qsvdec_other.c
@@ -60,6 +60,11 @@ static av_cold int qsv_decode_close(AVCodecContext *avctx)
 {
     QSVOtherContext *s = avctx->priv_data;
 
+#if CONFIG_VP8_QSV_DECODER
+    if (avctx->codec_id == AV_CODEC_ID_VP8)
+        av_freep(&s->qsv.load_plugins);
+#endif
+
     ff_qsv_decode_close(&s->qsv);
 
     qsv_clear_buffers(s);


======================================================================