gstreamer1.0-plugins-bad_git: fix gst_structure_get() etc compiler warnings
| ../../../gst-plugins-bad-1.7.1/sys/decklink/gstdecklinkaudiosrc.cpp: In function 'gboolean gst_decklink_audio_src_set_caps(GstBaseSrc*, GstCaps*)': | ../../../gst-plugins-bad-1.7.1/sys/decklink/gstdecklinkaudiosrc.cpp:315:59: error: missing sentinel in function call [-Werror=format=] | g_object_get (videosrc, "connection", &vconn, NULL); | ^ | cc1plus: all warnings being treated as errors For GStreamer functions declared with G_GNUC_NULL_TERMINATED, ie __attribute__((__sentinel__)), 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 callers to such functions within gst-plugins-bad use the C NULL definition (ie ((void*)0)), which is a valid sentinel. However the C++ NULL definition (ie 0L), is not a valid sentinel without an explicit cast to a pointer type. (From OE-Core rev: 4ffc1c6ea67e65c21964fa119820b37725f5a5de) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fdd89795e2
commit
78be954e90
|
@ -0,0 +1,67 @@
|
|||
From 3164f23cd6ae338d0e423fccb4e11539cd220e2f Mon Sep 17 00:00:00 2001
|
||||
From: Andre McCurdy <armccurdy@gmail.com>
|
||||
Date: Tue, 9 Feb 2016 14:00:00 -0800
|
||||
Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc
|
||||
|
||||
For GStreamer functions declared with G_GNUC_NULL_TERMINATED,
|
||||
ie __attribute__((__sentinel__)), 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 callers to such functions within gst-plugins-bad use the C NULL
|
||||
definition (ie ((void*)0)), which is a valid sentinel.
|
||||
|
||||
However the C++ NULL definition (ie 0L), is not a valid sentinel
|
||||
without an explicit cast to a pointer type.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
---
|
||||
sys/decklink/gstdecklink.cpp | 2 +-
|
||||
sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
|
||||
sys/decklink/gstdecklinkvideosink.cpp | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
|
||||
index c0d1128..6f2ef75 100644
|
||||
--- a/sys/decklink/gstdecklink.cpp
|
||||
+++ b/sys/decklink/gstdecklink.cpp
|
||||
@@ -328,7 +328,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e)
|
||||
"interlace-mode", G_TYPE_STRING,
|
||||
mode->interlaced ? "interleaved" : "progressive", "pixel-aspect-ratio",
|
||||
GST_TYPE_FRACTION, mode->par_n, mode->par_d, "colorimetry", G_TYPE_STRING,
|
||||
- mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", NULL);
|
||||
+ mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", (void *) NULL);
|
||||
}
|
||||
|
||||
GstCaps *
|
||||
diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
|
||||
index e5ac8ae..a153851 100644
|
||||
--- a/sys/decklink/gstdecklinkaudiosrc.cpp
|
||||
+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
|
||||
@@ -312,7 +312,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
|
||||
g_mutex_unlock (&self->input->lock);
|
||||
|
||||
if (videosrc) {
|
||||
- g_object_get (videosrc, "connection", &vconn, NULL);
|
||||
+ g_object_get (videosrc, "connection", &vconn, (void *) NULL);
|
||||
gst_object_unref (videosrc);
|
||||
|
||||
switch (vconn) {
|
||||
diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
|
||||
index 7111cb1..b958fda 100644
|
||||
--- a/sys/decklink/gstdecklinkvideosink.cpp
|
||||
+++ b/sys/decklink/gstdecklinkvideosink.cpp
|
||||
@@ -158,7 +158,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
|
||||
gpointer user_data)
|
||||
{
|
||||
gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
|
||||
- G_MAXINT, 1, NULL);
|
||||
+ G_MAXINT, 1, (void *) NULL);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
|
@ -13,6 +13,7 @@ SRC_URI = " \
|
|||
file://configure-allow-to-disable-libssh2.patch \
|
||||
file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
|
||||
file://avoid-including-sys-poll.h-directly.patch \
|
||||
file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
|
||||
"
|
||||
|
||||
PV = "1.7.1+git${SRCPV}"
|
||||
|
|
Loading…
Reference in New Issue