aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-11-18 03:31:41 -0600
committerJacek Antonelli2009-11-18 03:31:41 -0600
commit8bc17ad2a0fd4a1a3258ed20d18e42c3497bca05 (patch)
tree8b8281e6e2a6b585d3fd1d2718a886b174e6d1b9
parentSilenced some compiler warnings on Linux. (diff)
downloadmeta-impy-8bc17ad2a0fd4a1a3258ed20d18e42c3497bca05.zip
meta-impy-8bc17ad2a0fd4a1a3258ed20d18e42c3497bca05.tar.gz
meta-impy-8bc17ad2a0fd4a1a3258ed20d18e42c3497bca05.tar.bz2
meta-impy-8bc17ad2a0fd4a1a3258ed20d18e42c3497bca05.tar.xz
Fixed more warnings about converting string to gchar*
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamervidplug.cpp12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1b761f8..cea79e7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * Fixed more warnings about converting string to gchar*
4
5 modified: linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
6
7
3 * Silenced some compiler warnings on Linux. 8 * Silenced some compiler warnings on Linux.
4 9
5 modified: linden/indra/cmake/00-Common.cmake 10 modified: linden/indra/cmake/00-Common.cmake
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
index dd0aa25..df62470 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
@@ -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