[FFmpeg-cvslog] Merge commit '78149d6657302b58d5e46e8bc0a521ed009f86f7'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Sep  2 16:42:57 2018 -0300| [4069096dd535ee99175c2a29c1a1f59c3fc110c1] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4069096dd535ee99175c2a29c1a1f59c3fc110c1
---