summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-04-25 23:22:56 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-04-25 23:22:56 +0000
commit625a222f06d943aba5bbb14456bce9d2944ea827 (patch)
tree799321ae9d466a8d0a65ab13fdee59ff51a183d5 /ext
parente4c57a859a9a10dff53f378a60fb1b3d13fc7636 (diff)
downloadgst-plugins-bad-625a222f06d943aba5bbb14456bce9d2944ea827.tar.gz
gst-plugins-bad-625a222f06d943aba5bbb14456bce9d2944ea827.tar.bz2
gst-plugins-bad-625a222f06d943aba5bbb14456bce9d2944ea827.zip
ext/: Cast NULL sentinels to void * as NULL is defined as an integer constant in most environments when using C++ and...
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.
Diffstat (limited to 'ext')
-rw-r--r--ext/mpeg2enc/gstmpeg2enc.cc7
-rw-r--r--ext/soundtouch/gstbpmdetect.cc2
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc
index 0b8b728d..24a582f5 100644
--- a/ext/mpeg2enc/gstmpeg2enc.cc
+++ b/ext/mpeg2enc/gstmpeg2enc.cc
@@ -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;
diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc
index 1ec5452a..8b1d7f1f 100644
--- a/ext/soundtouch/gstbpmdetect.cc
+++ b/ext/soundtouch/gstbpmdetect.cc
@@ -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);