From: <sl...@ke...> - 2008-04-25 23:11:04
|
CVS Root: /cvs/gstreamer Module: gst-plugins-ugly Changes by: slomo Date: Fri Apr 25 2008 23:11:08 UTC Log message: * 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. Modified files: . : ChangeLog ext/sidplay : gstsiddec.cc Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ChangeLog.diff?r1=1.2358&r2=1.2359 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ext/sidplay/gstsiddec.cc.diff?r1=1.52&r2=1.53 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-ugly/ChangeLog,v retrieving revision 1.2358 retrieving revision 1.2359 diff -u -d -r1.2358 -r1.2359 --- ChangeLog 22 Apr 2008 12:11:29 -0000 1.2358 +++ ChangeLog 25 Apr 2008 23:10:53 -0000 1.2359 @@ -1,3 +1,10 @@ +2008-04-26 Sebastian Dröge <sl...@ci...> + + * 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 <edg...@in...> * gst/asfdemux/gstasfdemux.c: Index: gstsiddec.cc RCS file: /cvs/gstreamer/gst-plugins-ugly/ext/sidplay/gstsiddec.cc,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- gstsiddec.cc 10 Oct 2007 12:02:30 -0000 1.52 +++ gstsiddec.cc 25 Apr 2008 23:10:54 -0000 1.53 @@ -299,15 +299,15 @@ 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_ARTIST, info.authorString, NULL); + GST_TAG_ARTIST, info.authorString, (void *) NULL); if (info.copyrightString) { - 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); |