Use quicktime instead of gstreamer on Windows

author: McCabe Maxsted 2010-10-27 02:38:23 -0700
committer: McCabe Maxsted 2010-10-27 02:38:23 -0700
commit: d2a3064b8abc37853839441bdd1db0ce99ac5ef2 (patch)
tree: 2d475e0b8be59b39a6ca7d94f61f97c8e7a89f5a /linden/indra
parent: Fixed mime_types.xml not being copied on Windows (also fixes plugin dll copyi... (diff)
download: meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.zip
meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.tar.gz
meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.tar.bz2
meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.tar.xz
1 files changed, 14 insertions, 14 deletions
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 5ff3b19..abc7f1a 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_gstreamer
+                        media_plugin_quicktime
                </impl>
        </scheme>
        <mimetype name="blank">
@@ -120,7 +120,7 @@
                        none
                </widgettype>
                <impl>
-                        media_plugin_gstreamer
+                        media_plugin_quicktime
                </impl>
        </mimetype>
        <mimetype name="none/none">
@@ -163,7 +163,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
        <mimetype name="application/javascript">
@@ -214,7 +214,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_gstreamer
+                        media_plugin_quicktime
                </impl>
        </mimetype>
        <mimetype name="application/xhtml+xml">
@@ -241,7 +241,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_gstreamer
+                        media_plugin_quicktime
                </impl>
        </mimetype>
        <mimetype name="audio/mpeg">
@@ -252,7 +252,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_gstreamer
+                        media_plugin_quicktime
                </impl>
        </mimetype>
        <mimetype name="audio/x-aiff">
@@ -263,7 +263,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_gstreamer
+                        media_plugin_quicktime
                </impl>
        </mimetype>
        <mimetype name="audio/x-wav">
@@ -274,7 +274,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_gstreamer
+                        media_plugin_quicktime
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/bmp">
@@ -384,7 +384,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
        <mimetype name="video/mp4">
@@ -395,7 +395,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
        <mimetype menu="1" name="video/gstreamer">
@@ -406,7 +406,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
        <mimetype name="video/x-ms-asf">
@@ -417,7 +417,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
        <mimetype name="video/x-ms-wmv">
@@ -428,7 +428,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
        <mimetype menu="1" name="video/x-msvideo">
@@ -439,7 +439,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_gstreamer
+      media_plugin_quicktime
    </impl>
        </mimetype>
 </mimetypes>
author	McCabe Maxsted	2010-10-27 02:38:23 -0700
committer	McCabe Maxsted	2010-10-27 02:38:23 -0700
commit	d2a3064b8abc37853839441bdd1db0ce99ac5ef2 (patch)
tree	2d475e0b8be59b39a6ca7d94f61f97c8e7a89f5a /linden/indra
parent	Fixed mime_types.xml not being copied on Windows (also fixes plugin dll copyi... (diff)
download	meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.zip meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.tar.gz meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.tar.bz2 meta-impy-d2a3064b8abc37853839441bdd1db0ce99ac5ef2.tar.xz

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 5ff3b19..abc7f1a 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 @@
109	movie	109	movie
110	</widgettype>	110	</widgettype>
111	<impl>	111	<impl>
112	media_plugin_gstreamer	112	media_plugin_quicktime
113	</impl>	113	</impl>
114	</scheme>	114	</scheme>
115	<mimetype name="blank">	115	<mimetype name="blank">
@@ -120,7 +120,7 @@
120	none	120	none
121	</widgettype>	121	</widgettype>
122	<impl>	122	<impl>
123	media_plugin_gstreamer	123	media_plugin_quicktime
124	</impl>	124	</impl>
125	</mimetype>	125	</mimetype>
126	<mimetype name="none/none">	126	<mimetype name="none/none">
@@ -163,7 +163,7 @@
163	movie	163	movie
164	</widgettype>	164	</widgettype>
165	<impl>	165	<impl>
166	media_plugin_gstreamer	166	media_plugin_quicktime
167	</impl>	167	</impl>
168	</mimetype>	168	</mimetype>
169	<mimetype name="application/javascript">	169	<mimetype name="application/javascript">
@@ -214,7 +214,7 @@
214	movie	214	movie
215	</widgettype>	215	</widgettype>
216	<impl>	216	<impl>
217	media_plugin_gstreamer	217	media_plugin_quicktime
218	</impl>	218	</impl>
219	</mimetype>	219	</mimetype>
220	<mimetype name="application/xhtml+xml">	220	<mimetype name="application/xhtml+xml">
@@ -241,7 +241,7 @@
241	audio	241	audio
242	</widgettype>	242	</widgettype>
243	<impl>	243	<impl>
244	media_plugin_gstreamer	244	media_plugin_quicktime
245	</impl>	245	</impl>
246	</mimetype>	246	</mimetype>
247	<mimetype name="audio/mpeg">	247	<mimetype name="audio/mpeg">
@@ -252,7 +252,7 @@
252	audio	252	audio
253	</widgettype>	253	</widgettype>
254	<impl>	254	<impl>
255	media_plugin_gstreamer	255	media_plugin_quicktime
256	</impl>	256	</impl>
257	</mimetype>	257	</mimetype>
258	<mimetype name="audio/x-aiff">	258	<mimetype name="audio/x-aiff">
@@ -263,7 +263,7 @@
263	audio	263	audio
264	</widgettype>	264	</widgettype>
265	<impl>	265	<impl>
266	media_plugin_gstreamer	266	media_plugin_quicktime
267	</impl>	267	</impl>
268	</mimetype>	268	</mimetype>
269	<mimetype name="audio/x-wav">	269	<mimetype name="audio/x-wav">
@@ -274,7 +274,7 @@
274	audio	274	audio
275	</widgettype>	275	</widgettype>
276	<impl>	276	<impl>
277	media_plugin_gstreamer	277	media_plugin_quicktime
278	</impl>	278	</impl>
279	</mimetype>	279	</mimetype>
280	<mimetype menu="1" name="image/bmp">	280	<mimetype menu="1" name="image/bmp">
@@ -384,7 +384,7 @@
384	movie	384	movie
385	</widgettype>	385	</widgettype>
386	<impl>	386	<impl>
387	media_plugin_gstreamer	387	media_plugin_quicktime
388	</impl>	388	</impl>
389	</mimetype>	389	</mimetype>
390	<mimetype name="video/mp4">	390	<mimetype name="video/mp4">
@@ -395,7 +395,7 @@
395	movie	395	movie
396	</widgettype>	396	</widgettype>
397	<impl>	397	<impl>
398	media_plugin_gstreamer	398	media_plugin_quicktime
399	</impl>	399	</impl>
400	</mimetype>	400	</mimetype>
401	<mimetype menu="1" name="video/gstreamer">	401	<mimetype menu="1" name="video/gstreamer">
@@ -406,7 +406,7 @@
406	movie	406	movie
407	</widgettype>	407	</widgettype>
408	<impl>	408	<impl>
409	media_plugin_gstreamer	409	media_plugin_quicktime
410	</impl>	410	</impl>
411	</mimetype>	411	</mimetype>
412	<mimetype name="video/x-ms-asf">	412	<mimetype name="video/x-ms-asf">
@@ -417,7 +417,7 @@
417	movie	417	movie
418	</widgettype>	418	</widgettype>
419	<impl>	419	<impl>
420	media_plugin_gstreamer	420	media_plugin_quicktime
421	</impl>	421	</impl>
422	</mimetype>	422	</mimetype>
423	<mimetype name="video/x-ms-wmv">	423	<mimetype name="video/x-ms-wmv">
@@ -428,7 +428,7 @@
428	movie	428	movie
429	</widgettype>	429	</widgettype>
430	<impl>	430	<impl>
431	media_plugin_gstreamer	431	media_plugin_quicktime
432	</impl>	432	</impl>
433	</mimetype>	433	</mimetype>
434	<mimetype menu="1" name="video/x-msvideo">	434	<mimetype menu="1" name="video/x-msvideo">
@@ -439,7 +439,7 @@
439	movie	439	movie
440	</widgettype>	440	</widgettype>
441	<impl>	441	<impl>
442	media_plugin_gstreamer	442	media_plugin_quicktime
443	</impl>	443	</impl>
444	</mimetype>	444	</mimetype>
445	</mimetypes>	445	</mimetypes>