summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-05-27 16:53:16 -0700
committercallum_linden <none@none>2016-05-27 16:53:16 -0700
commit282956e7688169e539059385962cbd6a295255f6 (patch)
tree98bbb37c2cd35b2f425093278faa21a22c87d808 /indra/media_plugins
parentccfb18948df97bbb671fdd925b9d7a84e6345339 (diff)
Some simple tidy up and added a proper URL for video test button in web content floater
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/libvlc/media_plugin_libvlc.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index 92bfc15113..43d4e95243 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -173,26 +173,18 @@ void MediaPluginLibVLC::playMedia()
gLibVLCMedia = libvlc_media_new_location(gLibVLC, mURL.c_str());
if (!gLibVLCMedia)
{
- printf("libvlc_media_new_location failed\n");
- }
- else
- {
- printf("libvlc_media_new_location ok\n");
+ gLibVLCMediaPlayer = 0;
+ return;
}
gLibVLCMediaPlayer = libvlc_media_player_new_from_media(gLibVLCMedia);
if (!gLibVLCMediaPlayer)
{
- printf("libvlc_media_player_new_from_media failed\n");
- }
- else
- {
- printf("libvlc_media_player_new_from_media ok...\n");
+ return;
}
libvlc_media_release(gLibVLCMedia);
-
gVLCCallbackContext.parent = this;
gVLCCallbackContext.texture_pixels = mPixels;
gVLCCallbackContext.mp = gLibVLCMediaPlayer;