From 0ad0632f5dd276c1940c38c236602816781436d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 25 Apr 2008 23:10:54 +0000 Subject: [PATCH] ext/sidplay/gstsiddec.cc: Cast NULL sentinels to void * as NULL is defined as an integer constant in most environment... 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. --- ChangeLog | 7 +++++++ common | 2 +- ext/sidplay/gstsiddec.cc | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cdd07c14d..04d83a9742 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-26 Sebastian Dröge + + * 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 * gst/asfdemux/gstasfdemux.c: diff --git a/common b/common index 3bb6edfe92..f6fc3fa764 160000 --- 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 e6b8399e98..11c2d491d3 100644 --- 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);