Merge commit '7cb053e4ddf258e2dbf52ccc586548680742d758'
authorJames Almer <jamrial@gmail.com>
Mon, 6 Nov 2017 21:10:49 +0000 (18:10 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 6 Nov 2017 21:10:49 +0000 (18:10 -0300)
commit29ba2900cb6cf5ab9c251561d913e53719bbbd66
tree53673e9cb604fcd7217a2e06f396f2af551c035e
parent88d6f79ac087d2318f4e532ae99e0bc50bbc1929
parent7cb053e4ddf258e2dbf52ccc586548680742d758
Merge commit '7cb053e4ddf258e2dbf52ccc586548680742d758'

* commit '7cb053e4ddf258e2dbf52ccc586548680742d758':
  nvenc: Minimize the surface allocation
  nvenc: Use a fifo to manage the free surface pool
  nvenc: Add an explicit auto alias

This commit is a noop, see
7b0689c55f1f8ee3abca58e1e3522f1c33beb60b
8de3458a07376b0a96772e586b6dba5e93432f52
de2faec2faf34ee948d400101299d4ccdc1f3a50

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