From 1d3e052f723df0c3670e271a792a3bd84d6d1ca5 Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sun, 10 Oct 2010 15:52:28 +0100
Subject: Force mime_types.xml to use gstreamer as default

---
 .../newview/skins/default/xui/en-us/mime_types.xml | 38 +++++++++++-----------
 .../skins/default/xui/en-us/mime_types_windows.xml | 36 ++++++++++----------
 2 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui/en-us')

diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
index a585069..360438a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
@@ -109,7 +109,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -142,7 +142,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -153,7 +153,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -169,13 +169,13 @@
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			Movie (gstreamer)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -197,7 +197,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -274,7 +274,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -285,7 +285,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -296,7 +296,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -307,7 +307,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -417,7 +417,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -428,18 +428,18 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
-		<label name="video/quicktime_label">
-			Movie (QuickTime)
+	<mimetype menu="1" name="video/gstreamer">
+		<label name="video/gstreamer_label">
+			Movie (gstreamer)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -450,7 +450,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -461,7 +461,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +472,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 </mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 4a7a6e1..d4d47cb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -109,7 +109,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -120,7 +120,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -157,13 +157,13 @@
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			Movie (gstreamer)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer
     </impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -214,7 +214,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -241,7 +241,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -252,7 +252,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -263,7 +263,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -274,7 +274,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_gstreamer010
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -384,7 +384,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
     </impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -395,18 +395,18 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
     </impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
-		<label name="video/quicktime_label">
-			Movie (QuickTime)
+	<mimetype menu="1" name="video/gstreamer">
+		<label name="video/gstreamer_label">
+			Movie (gstreamer)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
     </impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -417,7 +417,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
     </impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -428,7 +428,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
     </impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -439,7 +439,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
     </impl>
 	</mimetype>
 </mimetypes>
-- 
cgit v1.1