summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-03 19:21:00 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-23 11:55:53 +0100
commit7671dd7cd7d51bbd637cc46d8f104a141bc355ea (patch)
tree894b4ff07c05f8cb2d7b2f266335b3c3fe9f8d56 /Makefile
parent07fd0a22192805d56c635eb294dc26b0a54ae325 (diff)
avconv: add support for VDPAU decoding
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index af83cfa7af..184aa37422 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,10 @@ PROGS-$(CONFIG_AVPROBE) += avprobe
PROGS-$(CONFIG_AVSERVER) += avserver
PROGS := $(PROGS-yes:%=%$(EXESUF))
+
OBJS-avconv = avconv_opt.o avconv_filter.o
+OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
+
TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
TOOLS = qt-faststart trasher
@@ -126,7 +129,7 @@ endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
define DOPROG
-OBJS-$(1) += $(1).o cmdutils.o $(EXEOBJS)
+OBJS-$(1) += $(1).o cmdutils.o $(EXEOBJS) $(OBJS-$(1)-yes)
$(1)$(EXESUF): $$(OBJS-$(1))
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))