Commit c3413a71 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '22522d9c'

* commit '22522d9c':
  qsvdec: fix a memleak of async_fifo

Conflicts:
	libavcodec/qsvdec.c
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents ef2a85ac 22522d9c
......@@ -125,10 +125,12 @@ int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt)
HEVC which is 16 for both cases.
So weare pre-allocating fifo big enough for 17 elements:
*/
if (!q->async_fifo) {
q->async_fifo = av_fifo_alloc((1 + 16) *
(sizeof(mfxSyncPoint) + sizeof(QSVFrame*)));
if (!q->async_fifo)
return AVERROR(ENOMEM);
}
q->input_fifo = av_fifo_alloc(1024*16);
if (!q->input_fifo)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment