summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-12 02:34:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-12 02:44:28 +0200
commit5460ab73d2e8169c54beda06e7cca762aee84a1f (patch)
tree8c50adb34c4df34a90cba7bc14edc84fe8bd4f13 /Makefile
parent2856332719d8ec182523f7793bb0517aaac68e73 (diff)
parent1839fafa951308237c4672ffd9a94f927b26eac7 (diff)
downloadffmpeg-streaming-5460ab73d2e8169c54beda06e7cca762aee84a1f.zip
ffmpeg-streaming-5460ab73d2e8169c54beda06e7cca762aee84a1f.tar.gz
Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 82467c3..6cd8fa3 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_o
OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o
OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
+OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_vda.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
OpenPOWER on IntegriCloud