mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

id3v2mux: ensure valid sentinal for gst_structure_get()

Browse source 
gst_structure_get() is declared with G_GNUC_NULL_TERMINATED, ie
__attribute__((__sentinel__)), which means gcc will generate a
warning if the last parameter passed to the function is not NULL
(where a valid NULL in this context is defined as zero with any
pointer type).

The C code callers to gst_structure_get() within gst-plugins-good
use the C NULL definition (ie ((void*)0)), which is a valid sentinel.

However gstid3v2mux.cc uses the C++ NULL definition (ie 0L), which
is not a valid sentinel without an explicit cast to a pointer type.

Upstream-Status: Pending

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
This commit is contained in:
Andre McCurdy 2016-02-09 14:00:00 -08:00 committed by Edward Hervey
parent 07abf5d60f
commit f9b7e2ab85
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/taglib/gstid3v2mux.cc
View file

@ -463,7 +463,7 @@ add_image_tag (ID3v2::Tag * id3v2tag, const GstTagList * list,
if (info_struct) { if (info_struct) {
if (gst_structure_get (info_struct, "image-type", if (gst_structure_get (info_struct, "image-type",
GST_TYPE_TAG_IMAGE_TYPE, &image_type, NULL)) { GST_TYPE_TAG_IMAGE_TYPE, &image_type, (void *) NULL)) {
if (image_type > 0 && image_type <= 18) { if (image_type > 0 && image_type <= 18) {
image_type += 2; image_type += 2;
} else { } else {