Merge commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:02:48 +0000 (17:02 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 17:02:48 +0000 (17:02 +0000)
commitef9915a0e2435a6dc4562c6cf0727408e46c9172
tree2fc3a9b5d8e63d51baec0d2c33090f1922c991db
parent14f942b3598273e30556ca292b963b832b09015c
parent21f7cd4acd8dc4b4796b55966dd015cb037164d8
Merge commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8'

* commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8':
  lavfi: add a filter for uploading normal frames to CUDA

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_hwupload_cuda.c