Преглед изворни кода

Merge pull request #1077 from Xaymar/plugins-enc-amf

enc-amf: Version 2.3.1
Jim пре 7 година
родитељ
комит
b183b49b5e
2 измењених фајлова са 5 додато и 8 уклоњено
  1. 4 7
      plugins/CMakeLists.txt
  2. 1 1
      plugins/enc-amf

+ 4 - 7
plugins/CMakeLists.txt

@@ -16,13 +16,10 @@ if(WIN32)
 	add_subdirectory(win-mf)
 	add_subdirectory(obs-qsv11)
 	add_subdirectory(vlc-video)
-	option(BUILD_AMF_ENCODER "Build AMD Advanced Media Framework encoder module" OFF)
-	if (BUILD_AMF_ENCODER)
-		if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/enc-amf/CMakeLists.txt")
-			add_subdirectory(enc-amf)
-		else()
-			message(STATUS "enc-amf submodule not found!  Please fetch submodules.  enc-amf plugin disabled.")
-		endif()
+	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/enc-amf/CMakeLists.txt")
+		add_subdirectory(enc-amf)
+	else()
+		message(STATUS "enc-amf submodule not found!  Please fetch submodules.  enc-amf plugin disabled.")
 	endif()
 	if (MSVC)
 		add_subdirectory(win-ivcam)

+ 1 - 1
plugins/enc-amf

@@ -1 +1 @@
-Subproject commit 477006177bdfe8285885dae46ec89723b7604a69
+Subproject commit 09e8a51e27a398647dfbc92ee8f24fd34ce5eebc