projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22219a3 78149d6)
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)
* 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>

Trivial merge
FFmpeg git repo