Merge commit '78149d6657302b58d5e46e8bc0a521ed009f86f7'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 19:42:57 +0000 (16:42 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 19:42:57 +0000 (16:42 -0300)
commit4069096dd535ee99175c2a29c1a1f59c3fc110c1
treeb408870212e8687c2cff34e8cf25f53244f1c6c6
parent22219a3ac46ac18f797c94e4619a34728556786c
parent78149d6657302b58d5e46e8bc0a521ed009f86f7
Merge commit '78149d6657302b58d5e46e8bc0a521ed009f86f7'

* commit '78149d6657302b58d5e46e8bc0a521ed009f86f7':
  amfenc: Retain a reference to D3D frames used as input during the encoding process

This commit is a noop, see 05f1a3face140373ae658ab1abd6bacc841a770d

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