X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=b0ab3ed0cc54f9a3275ab5cddd70d20ef0895771;hb=280d140cb02b91d213f7016152fa7ab7b2cb0e75;hp=4e788cdae3420ce84b732746a3ceb01d366e0b4b;hpb=d560c61125b3ee0ec8cd2e228f0604b63f85b8b2;p=ffmpeg diff --git a/Makefile b/Makefile index 4e788cdae34..b0ab3ed0cc5 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