diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:05:58 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:05:58 +0000 |
commit | e05704bd46b9107af25204dff47bd8b034868ae4 (patch) | |
tree | b018d11ae7388ef6bec7bc91871bc6f1f09a321e /tests/ffserver.conf | |
parent | 7e49cdd12973ceea7545bf43966de563ce92bcf7 (diff) | |
parent | 871d0930d4c8666df5514093beff874acbe5cce0 (diff) | |
download | ffmpeg-e05704bd46b9107af25204dff47bd8b034868ae4.tar.gz |
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>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions