From: <sl...@ke...> - 2008-04-25 23:23:02
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Fri Apr 25 2008 23:23:10 UTC Log message: * ext/mpeg2enc/gstmpeg2enc.cc: * ext/soundtouch/gstbpmdetect.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. Modified files: . : ChangeLog ext/mpeg2enc : gstmpeg2enc.cc ext/soundtouch : gstbpmdetect.cc Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3286&r2=1.3287 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/mpeg2enc/gstmpeg2enc.cc.diff?r1=1.22&r2=1.23 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/soundtouch/gstbpmdetect.cc.diff?r1=1.3&r2=1.4 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3286 retrieving revision 1.3287 diff -u -d -r1.3286 -r1.3287 --- ChangeLog 25 Apr 2008 18:18:46 -0000 1.3286 +++ ChangeLog 25 Apr 2008 23:22:55 -0000 1.3287 @@ -1,3 +1,11 @@ +2008-04-26 Sebastian Dröge <sl...@ci...> + + * ext/mpeg2enc/gstmpeg2enc.cc: + * ext/soundtouch/gstbpmdetect.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. 2008-04-25 Wim Taymans <wim...@co...> * gst-libs/gst/app/gstappsink.c: (gst_app_sink_class_init), Index: gstmpeg2enc.cc RCS file: /cvs/gstreamer/gst-plugins-bad/ext/mpeg2enc/gstmpeg2enc.cc,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gstmpeg2enc.cc 5 Mar 2008 05:38:05 -0000 1.22 +++ gstmpeg2enc.cc 25 Apr 2008 23:22:56 -0000 1.23 @@ -290,13 +290,14 @@ break; } case 'n': - gst_structure_set (structure, "height", G_TYPE_INT, ntsc_v, NULL); + gst_structure_set (structure, "height", G_TYPE_INT, ntsc_v, + (void *) NULL); default: - gst_structure_set (structure, "height", G_TYPE_INT, pal_v, NULL); + gst_structure_set (structure, "height", G_TYPE_INT, pal_v, (void *) NULL); } - gst_structure_set (structure, "width", G_TYPE_INT, horiz, NULL); + gst_structure_set (structure, "width", G_TYPE_INT, horiz, (void *) NULL); gst_mpeg2enc_add_fps (structure, gst_mpeg2enc_get_fps (enc)); return structure; Index: gstbpmdetect.cc RCS file: /cvs/gstreamer/gst-plugins-bad/ext/soundtouch/gstbpmdetect.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gstbpmdetect.cc 28 Jan 2008 11:47:18 -0000 1.3 +++ gstbpmdetect.cc 25 Apr 2008 23:22:56 -0000 1.4 @@ -221,7 +221,7 @@ GstTagList *tags = gst_tag_list_new (); gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE_ALL, GST_TAG_BEATS_PER_MINUTE, - bpm, NULL); + bpm, (void *) NULL); gst_element_found_tags (GST_ELEMENT (bpm_detect), tags); GST_INFO_OBJECT (bpm_detect, "Detected BPM: %lf\n", bpm); |