diff options
| author | Callum Linden <callum@lindenlab.com> | 2017-01-27 15:47:16 -0800 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2017-01-27 15:47:16 -0800 |
| commit | dcae92c0a306aaf6447089b340913d4a678855ac (patch) | |
| tree | 6897d6080067b39f4ab1ff628dbeb047601117ed /indra/media_plugins | |
| parent | f13c2a6d31ed44fb620cc7709802861bfdbf98c4 (diff) | |
First batch of changes to add LibVLC media plugin to macOS viewer. Plugin fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt index f654c15183..1eadce825e 100644 --- a/indra/media_plugins/CMakeLists.txt +++ b/indra/media_plugins/CMakeLists.txt @@ -9,6 +9,7 @@ endif (LINUX) if (DARWIN) add_subdirectory(cef) + add_subdirectory(libvlc) endif (DARWIN) if (WINDOWS) diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index 0bd323eb58..c2dff49bb3 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -159,6 +159,10 @@ void MediaPluginLibVLC::initVLC() "--video-filter=transform{type=vflip}", // MAINT-6578 Y flip textures in plugin vs client }; +#if LL_DARWIN + setenv("VLC_PLUGIN_PATH", ".", 1); +#endif + int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); mLibVLC = libvlc_new(vlc_argc, vlc_argv); |