From f0e9566b90183081daef4ff8b534093fbcf73e6d Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 13 May 2016 13:09:12 -0700
Subject: pull in unflipped version of LLCEFLib

---
 indra/media_plugins/cef/media_plugin_cef.cpp       |  2 +-
 indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra/media_plugins')

diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 8d9d1dd975..d61bd680df 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -488,7 +488,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				message.setValueU32("internalformat", GL_RGB);
 				message.setValueU32("format", GL_BGRA);
 				message.setValueU32("type", GL_UNSIGNED_BYTE);
-				message.setValueBoolean("coords_opengl", true);
+				message.setValueBoolean("coords_opengl", false);
 				sendMessage(message);
 			}
 			else if (message_name == "set_user_data_path")
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index 08716e1a1c..920c32f1f7 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -56,6 +56,7 @@ class MediaPluginLibVLC :
 		void resetVLC();
 
 		static void* lock(void* data, void** p_pixels);
+		static void unlock(void* data, void* id, void* const* raw_pixels);
 		static void display(void* data, void* id);
 
 		libvlc_instance_t* gLibVLC;
@@ -109,6 +110,14 @@ void* MediaPluginLibVLC::lock(void* data, void** p_pixels)
 	return NULL;
 }
 
+/////////////////////////////////////////////////////////////////////////////////
+//
+void MediaPluginLibVLC::unlock(void* data, void* id, void* const* raw_pixels)
+{
+	// nothing to do here for the moment.
+	// we can modify the raw_pixels here if we want to.
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 void MediaPluginLibVLC::display(void* data, void* id)
@@ -188,7 +197,7 @@ void MediaPluginLibVLC::playMedia()
 	gVLCCallbackContext.texture_pixels = mPixels;
 	gVLCCallbackContext.mp = gLibVLCMediaPlayer;
 
-	libvlc_video_set_callbacks(gLibVLCMediaPlayer, lock, NULL, display, &gVLCCallbackContext);
+	libvlc_video_set_callbacks(gLibVLCMediaPlayer, lock, unlock, display, &gVLCCallbackContext);
 	libvlc_video_set_format(gLibVLCMediaPlayer, "RV32", mWidth, mHeight, mWidth * 4);
 	libvlc_media_player_play(gLibVLCMediaPlayer);
 }
@@ -281,7 +290,6 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
         {
             if(message_name == "init")
             {
-                mDepth = 4;
                 LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
                 message.setValueS32("default_width", 1024);
                 message.setValueS32("default_height", 1024);
@@ -289,7 +297,7 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
 				message.setValueU32("internalformat", GL_RGB);
                 message.setValueU32("format", GL_BGRA_EXT);
                 message.setValueU32("type", GL_UNSIGNED_BYTE);
-                message.setValueBoolean("coords_opengl", true);
+                message.setValueBoolean("coords_opengl", false);
                 sendMessage(message);
             }
             else if(message_name == "size_change")
-- 
cgit v1.2.3