summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-04-28 23:00:38 +0200
committerAnton Khirnov <anton@khirnov.net>2014-04-28 23:02:56 +0200
commita61c2115fb936d50b8b0328d00562fe529a7c46a (patch)
tree8de5d3e343e2806e56b7e5297a9198cfa96dc3aa /Makefile
parent35177ba77ff60a8b8839783f57e44bcc4214507a (diff)
configure: rework dxva in avconv handling
Move the dxva check after the dependencies have been detected, make sure the ole32 library exists. Fixes build on non-Windows.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2d9dcd73e7..c34320b243 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
OBJS-avconv += avconv_opt.o avconv_filter.o
OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
-OBJS-avconv-$(CONFIG_DXVA2) += avconv_dxva2.o
+OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options