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

Merge pull request #562 from tgurr/vlc-video-linux 

vlc-video: Enable building the plugin on Linux
master
Jim 2016-07-13 00:34:17 -07:00 committed by GitHub
parent 2732375dba c086aac2ea
commit 0c415ee12c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/CMakeLists.txt
View File

@ -26,6 +26,7 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
add_subdirectory(linux-jack)
add_subdirectory(linux-alsa)
add_subdirectory(decklink/linux)
add_subdirectory(vlc-video)
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
add_subdirectory(linux-capture)
add_subdirectory(linux-pulseaudio)

2
plugins/vlc-video/vlc-video-plugin.c
View File

@ -149,7 +149,7 @@ static bool load_libvlc_module(void)
#define LIBVLC_FILE LIBVLC_DIR "lib/libvlc.5.dylib"
setenv("VLC_PLUGIN_PATH", LIBVLC_DIR "plugins", false);
#else
#define LIBVLC_FILE "libvlc.5.so"
#define LIBVLC_FILE "libvlc.so.5"
#endif
libvlc_module = os_dlopen(LIBVLC_FILE);