summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-02-24 09:40:15 -0700
committerJohn Stebbins <[email protected]>2019-03-07 13:59:35 -0800
commitbdb6e72f41cdf975f75323001a2015f6c14e97a4 (patch)
tree1b262200377ec963768dc062973ec17df4e5df66 /contrib/ffmpeg
parent001b68550f8db0927cb887dea0e4cd4bebbdfb4d (diff)
qsv: disable xlib in ffmpeg
It is autodetected and results in link failure if ffmpeg finds it bacause we do not add it to final link flags
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/module.defs5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 6ad601fdf..03ef81817 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -59,9 +59,10 @@ FFMPEG.CONFIGURE.extra = \
--extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
ifeq (1-linux,$(FEATURE.qsv)-$(BUILD.system))
-FFMPEG.CONFIGURE.extra += --enable-vaapi
+ FFMPEG.CONFIGURE.extra += --enable-vaapi
+ FFMPEG.CONFIGURE.extra += --disable-xlib
else
-FFMPEG.CONFIGURE.extra += --disable-vaapi
+ FFMPEG.CONFIGURE.extra += --disable-vaapi
endif
ifeq (1,$(FEATURE.fdk_aac))