ext/sidplay/gstsiddec.cc: Cast NULL sentinels to void * as NULL is defined as an...

Original commit message from CVS:
* ext/sidplay/gstsiddec.cc:
Cast NULL sentinels to void * as NULL is defined as an integer
constant in most environments when using C++ and it's size might
be different from a pointer. Fixes #529488.

diff --git a/ChangeLog b/ChangeLog
index 3cdd07c14dc97eca17f410d2076289c2fbce6561..04d83a97422284ff41a78a40941da3c32633d073 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-26  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * ext/sidplay/gstsiddec.cc:
+       Cast NULL sentinels to void * as NULL is defined as an integer
+       constant in most environments when using C++ and it's size might
+       be different from a pointer. Fixes #529488.
+
 2008-04-22  Edgard Lima  <edgard.lima@indt.org.br>
 
        * gst/asfdemux/gstasfdemux.c:

diff --git a/common b/common
index 3bb6edfe927d6d3020d2f2a4604f54caa61cd104..f6fc3fa7643c03eb912f4e259d48c99b0e8d0aca 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3bb6edfe927d6d3020d2f2a4604f54caa61cd104
+Subproject commit f6fc3fa7643c03eb912f4e259d48c99b0e8d0aca

diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index e6b8399e981761bd51f2a423f534e3a4eb4b3336..11c2d491d3dffe7449693bcf8a656994c36f6be0 100644 (file)
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -299,15 +299,15 @@ update_tags (GstSidDec * siddec)
 
     if (info.nameString) {
       gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
-          GST_TAG_TITLE, info.nameString, NULL);
+          GST_TAG_TITLE, info.nameString, (void *) NULL);
     }
     if (info.authorString) {
       gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
-          GST_TAG_ARTIST, info.authorString, NULL);
+          GST_TAG_ARTIST, info.authorString, (void *) NULL);
     }
     if (info.copyrightString) {
       gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
-          GST_TAG_COPYRIGHT, info.copyrightString, NULL);
+          GST_TAG_COPYRIGHT, info.copyrightString, (void *) NULL);
     }
     gst_element_found_tags_for_pad (GST_ELEMENT_CAST (siddec),
         siddec->srcpad, list);