Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-11 20:46:24 +0300
committerJames Almer <jamrial@gmail.com>2017-11-11 21:07:06 +0300
commit4391d6cb8180f1261e38a588b7c4ffc457531cb2 (patch)
tree395a644768e01bc663a00be797119c302929b58e /libavfilter/Makefile
parent64f9188aae2d5b9f94550285385c0110ea784226 (diff)
parenta5a6ac1a123a927e5bed984ed757a29b7ff87dab (diff)
Merge commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab'
* commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab': libavfilter/overlay_qsv: Add QSV overlay vpp filter libavfilter/vf_vpp: Add common filters of the qsv vpp Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/Makefile')
-rw-r--r--libavfilter/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 9873532d07..b7ddcd226d 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -25,6 +25,9 @@ OBJS = allfilters.o \
OBJS-$(HAVE_THREADS) += pthread.o
+# subsystems
+OBJS-$(CONFIG_QSVVPP) += qsvvpp.o
+
# audio filters
OBJS-$(CONFIG_ABENCH_FILTER) += f_bench.o
OBJS-$(CONFIG_ACOMPRESSOR_FILTER) += af_sidechaincompress.o
@@ -248,6 +251,7 @@ OBJS-$(CONFIG_OCV_FILTER) += vf_libopencv.o
OBJS-$(CONFIG_OPENCL) += deshake_opencl.o unsharp_opencl.o
OBJS-$(CONFIG_OSCILLOSCOPE_FILTER) += vf_datascope.o
OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o framesync.o
+OBJS-$(CONFIG_OVERLAY_QSV_FILTER) += vf_overlay_qsv.o
OBJS-$(CONFIG_OWDENOISE_FILTER) += vf_owdenoise.o
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PALETTEGEN_FILTER) += vf_palettegen.o
@@ -331,6 +335,7 @@ OBJS-$(CONFIG_VIDSTABDETECT_FILTER) += vidstabutils.o vf_vidstabdetect.
OBJS-$(CONFIG_VIDSTABTRANSFORM_FILTER) += vidstabutils.o vf_vidstabtransform.o
OBJS-$(CONFIG_VIGNETTE_FILTER) += vf_vignette.o
OBJS-$(CONFIG_VMAFMOTION_FILTER) += vf_vmafmotion.o framesync.o
+OBJS-$(CONFIG_VPP_QSV_FILTER) += vf_vpp_qsv.o
OBJS-$(CONFIG_VSTACK_FILTER) += vf_stack.o framesync.o
OBJS-$(CONFIG_W3FDIF_FILTER) += vf_w3fdif.o
OBJS-$(CONFIG_WAVEFORM_FILTER) += vf_waveform.o
@@ -389,6 +394,8 @@ SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_opencl
OBJS-$(CONFIG_SHARED) += log2_tab.o
+SKIPHEADERS-$(CONFIG_QSVVPP) += qsvvpp.h
+
TOOLS = graph2dot
TESTPROGS = drawutils filtfmts formats integral