]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'
authorJames Almer <jamrial@gmail.com>
Tue, 18 Sep 2018 16:28:05 +0000 (13:28 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 18 Sep 2018 16:28:05 +0000 (13:28 -0300)
* commit 'a2041a6522642859ce64af1c618d6fb90a50d4af':
  qsvenc: AV_PIX_FMT_QSV path should release frame

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/qsvenc.c

index 029e8f301ab4eaf99780c05a8c83762574e918da,17a0559f36a46357aade6dd99503111d12b9e35a..948751daf4ab889e66fc4f7e8bf824081828502e
@@@ -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;