Merge commit '871d0930d4c8666df5514093beff874acbe5cce0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:05:58 +0000 (17:05 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:05:58 +0000 (17:05 +0000)
commite05704bd46b9107af25204dff47bd8b034868ae4
treeb018d11ae7388ef6bec7bc91871bc6f1f09a321e
parent7e49cdd12973ceea7545bf43966de563ce92bcf7
parent871d0930d4c8666df5514093beff874acbe5cce0
Merge commit '871d0930d4c8666df5514093beff874acbe5cce0'

Timo is going to implement this for us.

* commit '871d0930d4c8666df5514093beff874acbe5cce0':
  nvenc: support CUDA frames as input

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>