Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index b0ab3ed0cc54f9a3275ab5cddd70d20ef0895771..306f060ec3ac64201ec77a740456068f171d2f36 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,7 @@ ifndef CONFIG_VIDEOTOOLBOX
 OBJS-ffmpeg-$(CONFIG_VDA)     += ffmpeg_videotoolbox.o
 endif
 OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o
+OBJS-ffmpeg-$(CONFIG_LIBMFX)  += ffmpeg_qsv.o
 OBJS-ffserver                 += ffserver_config.o
 
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr tiny_ssim base64