From: James Almer <jamrial@gmail.com>
Date: Tue, 18 Sep 2018 16:28:05 +0000 (-0300)
Subject: Merge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f4cf6ba8c9646814af842a99335c6ee312ded299;p=ffmpeg

Merge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'

* commit 'a2041a6522642859ce64af1c618d6fb90a50d4af':
  qsvenc: AV_PIX_FMT_QSV path should release frame

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

f4cf6ba8c9646814af842a99335c6ee312ded299
diff --cc libavcodec/qsvenc.c
index 029e8f301ab,17a0559f36a..948751daf4a
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@@ -1025,7 -1028,9 +1025,10 @@@ static void clear_unused_frames(QSVEncC
      QSVFrame *cur = q->work_frames;
      while (cur) {
          if (cur->used && !cur->surface.Data.Locked) {
 +            free_encoder_ctrl_payloads(&cur->enc_ctrl);
+             if (cur->frame->format == AV_PIX_FMT_QSV) {
+                 av_frame_unref(cur->frame);
+             }
              cur->used = 0;
          }
          cur = cur->next;