diff options
| author | Martin Storsjö <[email protected]> | 2020-04-24 15:21:58 +0300 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2021-02-20 16:22:30 -0500 |
| commit | 8c7b444a92a801cc7567e890a7df9f503836857d (patch) | |
| tree | 1e67ac8a6481cf1007d6824642409f5f6ca4bef1 | |
| parent | fecb01262bc36d1f158e47ac6c207c7334cb4e36 (diff) | |
contrib: ffmpeg: Enable the MediaFoundation encoder wrappers
| -rw-r--r-- | contrib/ffmpeg/module.defs | 4 | ||||
| -rw-r--r-- | gtk/configure.ac | 2 | ||||
| -rw-r--r-- | libhb/module.defs | 2 | ||||
| -rw-r--r-- | test/module.defs | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 4bee8a574..0ca58862a 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -113,7 +113,9 @@ else ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) --arch=$(HOST.machine) \ --cross-prefix=$(HOST.cross.prefix) \ --pkg-config=$(PKGCONFIG.exe) \ - --pkg-config-flags="--static" + --pkg-config-flags="--static" \ + --enable-encoder=h264_mf \ + --enable-encoder=hevc_mf FFMPEG.GCC.args.extra += -fno-common FFMPEG.GCC.args.extra-ldflags = -static-libgcc -static-libstdc++ -static else ifeq (darwin,$(HOST.system)) diff --git a/gtk/configure.ac b/gtk/configure.ac index d336d8d66..088e5b413 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -231,7 +231,7 @@ case $host in if test "x$use_libpthread" = "xyes" ; then HB_LIBS="$HB_LIBS -lpthread" fi - HB_LIBS="$HB_LIBS -lbcrypt -lregex -luuid -lole32" + HB_LIBS="$HB_LIBS -lbcrypt -lregex -luuid -lole32 -lmfplat -lstrmiids" ;; *-*-freebsd*) HB_LIBS="$HB_LIBS -lpthread" diff --git a/libhb/module.defs b/libhb/module.defs index e04d3ecfb..ef5b4095e 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -170,7 +170,7 @@ else endif LIBHB.GCC.args.extra.dylib++ += -Wl,--out-implib,$(LIBHB.lib) -LIBHB.GCC.l += bcrypt ws2_32 uuid ole32 +LIBHB.GCC.l += bcrypt ws2_32 uuid ole32 mfplat strmiids ifeq ($(HAS.dlfcn),1) LIBHB.GCC.l += dl endif diff --git a/test/module.defs b/test/module.defs index 01a322207..ea4ea630f 100644 --- a/test/module.defs +++ b/test/module.defs @@ -89,7 +89,7 @@ ifeq (1,$(HAS.pthread)) else TEST.GCC.l += pthreadGC2 endif - TEST.GCC.l += bcrypt iconv ws2_32 regex uuid ole32 + TEST.GCC.l += bcrypt iconv ws2_32 regex uuid ole32 mfplat strmiids TEST.GCC.D += PTW32_STATIC_LIB TEST.GCC.args.extra.exe++ += -static endif # (1-mingw,$(HOST.cross)-$(HOST.system)) |