summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSebastien Zwickert <dilaroga@gmail.com>2015-07-11 13:23:21 +0200
committerClément Bœsch <clement@stupeflix.com>2015-08-03 10:12:10 +0200
commit11d923d41412223ed255f31489222321b11d0397 (patch)
tree79c8ec8438b9cfe8be952a2e6aba9e5e0797f669 /Makefile
parent127203ba5a0b9fab652a5095e52f3d247abc98e5 (diff)
downloadffmpeg-streaming-11d923d41412223ed255f31489222321b11d0397.zip
ffmpeg-streaming-11d923d41412223ed255f31489222321b11d0397.tar.gz
avcodec: add new Videotoolbox hwaccel.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4e788cd..b0ab3ed 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,10 @@ $(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
+ifndef CONFIG_VIDEOTOOLBOX
+OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_videotoolbox.o
+endif
+OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o
OBJS-ffserver += ffserver_config.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
OpenPOWER on IntegriCloud