mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/: Cast NULL sentinels to void * as NULL is defined as an integer constant in most environments when using C++ and...

Browse source 
Original commit message from CVS:
* 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.
This commit is contained in:
Sebastian Dröge 2008-04-25 23:22:56 +00:00
parent e4c57a859a
commit 625a222f06
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-04-26 Sebastian Dröge <slomo@circular-chaos.org>
* 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.taymans@collabora.co.uk>
* gst-libs/gst/app/gstappsink.c: (gst_app_sink_class_init),

7
ext/mpeg2enc/gstmpeg2enc.cc
View file

@ -290,13 +290,14 @@ gst_mpeg2enc_structure_from_norm (GstMpeg2enc * enc, gint horiz,
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);
break;
default:
gst_structure_set (structure, "height", G_TYPE_INT, pal_v, NULL);
gst_structure_set (structure, "height", G_TYPE_INT, pal_v, (void *) NULL);
break;
}
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;

2
ext/soundtouch/gstbpmdetect.cc
View file

@ -221,7 +221,7 @@ gst_bpm_detect_transform_ip (GstBaseTransform * trans, GstBuffer * in)
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);