projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8822e2b
325aa63
)
Merge commit '325aa63dd1a3abc2453914d0bc111d297833d725'
author
James Almer
<jamrial@gmail.com>
Tue, 11 Sep 2018 16:11:22 +0000
(13:11 -0300)
committer
James Almer
<jamrial@gmail.com>
Tue, 11 Sep 2018 16:11:22 +0000
(13:11 -0300)
* commit '
325aa63dd1a3abc2453914d0bc111d297833d725
':
qsv: enforcing continuous memory layout
Merged-by: James Almer <jamrial@gmail.com>
1
2
libavcodec/qsvenc.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavcodec/qsvenc.c
index
c4cdebf
,
c74b3ae
..
a866454
---
1
/
libavcodec/qsvenc.c
---
2
/
libavcodec/qsvenc.c
+++ b/
libavcodec/qsvenc.c
@@@
-1011,8
-1014,6
+1011,7
@@@
static void clear_unused_frames(QSVEncC
QSVFrame *cur = q->work_frames;
while (cur) {
if (cur->used && !cur->surface.Data.Locked) {
- av_frame_unref(cur->frame);
+ free_encoder_ctrl_payloads(&cur->enc_ctrl);
cur->used = 0;
}
cur = cur->next;