diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:02:48 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:02:48 +0000 |
| commit | ef9915a0e2435a6dc4562c6cf0727408e46c9172 (patch) | |
| tree | 2fc3a9b5d8e63d51baec0d2c33090f1922c991db /libavfilter/Makefile | |
| parent | 14f942b3598273e30556ca292b963b832b09015c (diff) | |
| parent | 21f7cd4acd8dc4b4796b55966dd015cb037164d8 (diff) | |
| download | ffmpeg-ef9915a0e2435a6dc4562c6cf0727408e46c9172.tar.gz | |
Merge commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8'
* commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8':
lavfi: add a filter for uploading normal frames to CUDA
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/Makefile')
| -rw-r--r-- | libavfilter/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index a8469fd224..1d3d0c6061 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -175,6 +175,7 @@ OBJS-$(CONFIG_HISTEQ_FILTER) += vf_histeq.o OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o OBJS-$(CONFIG_HQX_FILTER) += vf_hqx.o +OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync.o OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o |