aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-11-15 21:48:54 -0600
committerJacek Antonelli2009-11-15 21:48:54 -0600
commitabaad41e2e87d45f2121c8d996181d6e88d3d6d9 (patch)
treecf954e88ec1658cac8b7532a397bfa8762ff2969
parentFixed Hide Group Titles preferences option (diff)
downloadmeta-impy-abaad41e2e87d45f2121c8d996181d6e88d3d6d9.zip
meta-impy-abaad41e2e87d45f2121c8d996181d6e88d3d6d9.tar.gz
meta-impy-abaad41e2e87d45f2121c8d996181d6e88d3d6d9.tar.bz2
meta-impy-abaad41e2e87d45f2121c8d996181d6e88d3d6d9.tar.xz
Fixed a warning about converting string literal to gchar*.
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamervidplug.cpp8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8d437c9..096048a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
12009-11-15 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * Fixed a warning about converting string literal to gchar*.
4
5 modified: linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
6
12009-11-12 McCabe Maxsted <hakushakukun@gmail.com> 72009-11-12 McCabe Maxsted <hakushakukun@gmail.com>
2 8
3 * Fixed Hide Group Titles preferences option. 9 * Fixed Hide Group Titles preferences option.
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
index 0fa2800..dd0aa25 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
@@ -79,10 +79,10 @@ static void
79gst_slvideo_base_init (gpointer gclass) 79gst_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