diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:29:37 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:29:37 -0800 |
| commit | 238f9350b8fec05a170ce0cf93e50783b07a5abf (patch) | |
| tree | 719eccc4fd476c4a746c2ad3117c5b0f51190404 /indra/media_plugins/libvlc/media_plugin_libvlc.cpp | |
| parent | 13ec15beb948f0036ea281a5bee25355b5d5478b (diff) | |
| parent | ac9777bd8eed3899c48ba203d88911085c09e65a (diff) | |
Automated merge with head of callum_linden/viewer64-xcode8
Diffstat (limited to 'indra/media_plugins/libvlc/media_plugin_libvlc.cpp')
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index ebcdde2960..048e7675f8 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -161,6 +161,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); |