jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

enc-amf: Version 2.3.1
master
Jim 2018-01-20 10:50:25 -08:00 committed by GitHub
parent 6774bbdb83 e7c2381651
commit b183b49b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/CMakeLists.txt
View File

@ -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)

2
plugins/enc-amf

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