diff options
author | Jacek Antonelli | 2009-11-18 21:37:24 -0600 |
---|---|---|
committer | McCabe Maxsted | 2009-11-18 21:25:32 -0700 |
commit | 5132fe32f8a514edcd110f8d94340ed9406cb7f8 (patch) | |
tree | d0fa4aeaf989aaf29246bd43021c426475b9d8c7 /linden/indra/llmedia/llmediaimplgstreamervidplug.cpp | |
parent | Cleaned up a harmless bad merge in llimagej2coj.cpp (diff) | |
parent | Fixed a compile blocker in LLVoSky::stepCurrent(). (diff) | |
download | meta-impy-5132fe32f8a514edcd110f8d94340ed9406cb7f8.zip meta-impy-5132fe32f8a514edcd110f8d94340ed9406cb7f8.tar.gz meta-impy-5132fe32f8a514edcd110f8d94340ed9406cb7f8.tar.bz2 meta-impy-5132fe32f8a514edcd110f8d94340ed9406cb7f8.tar.xz |
Fixed a compile blocker in LLVoSky::stepCurrent().
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamervidplug.cpp')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamervidplug.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp index 0fa2800..df62470 100644 --- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp | |||
@@ -79,10 +79,10 @@ static void | |||
79 | gst_slvideo_base_init (gpointer gclass) | 79 | gst_slvideo_base_init (gpointer gclass) |
80 | { | 80 | { |
81 | static GstElementDetails element_details = { | 81 | static GstElementDetails element_details = { |
82 | "PluginTemplate", | 82 | (gchar*)"PluginTemplate", |
83 | "Generic/PluginTemplate", | 83 | (gchar*)"Generic/PluginTemplate", |
84 | "Generic Template Element", | 84 | (gchar*)"Generic Template Element", |
85 | "Linden Lab" | 85 | (gchar*)"Linden Lab" |
86 | }; | 86 | }; |
87 | GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); | 87 | GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); |
88 | 88 | ||
@@ -440,14 +440,14 @@ void gst_slvideo_init_class (void) | |||
440 | { | 440 | { |
441 | gst_plugin_register_static( GST_VERSION_MAJOR, | 441 | gst_plugin_register_static( GST_VERSION_MAJOR, |
442 | GST_VERSION_MINOR, | 442 | GST_VERSION_MINOR, |
443 | "private-slvideoplugin", | 443 | (const gchar *)"private-slvideoplugin", |
444 | "SL Video sink plugin", | 444 | (gchar *)"SL Video sink plugin", |
445 | plugin_init, | 445 | plugin_init, |
446 | "0.1", | 446 | (const gchar *)"0.1", |
447 | GST_LICENSE_UNKNOWN, | 447 | GST_LICENSE_UNKNOWN, |
448 | "Second Life", | 448 | (const gchar *)"Second Life", |
449 | "Second Life", | 449 | (const gchar *)"Second Life", |
450 | "http://www.secondlife.com/" ); | 450 | (const gchar *)"http://www.secondlife.com/" ); |
451 | } | 451 | } |
452 | 452 | ||
453 | ///#endif // LL_GSTREAMER_ENABLED | 453 | ///#endif // LL_GSTREAMER_ENABLED |