mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
gstreamer1.0-plugins-bad: remove an unneeded patch
Latest gcc no longer produces the warnings that this patch was fixing. (From OE-Core rev: 815fc7dce4a6f666f3cb6aadb6057cdcd9c0c941) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
72c8aa7c44
commit
0caa3bb889
@@ -1,86 +0,0 @@
|
||||
From 001fa08542dd5fc79571f7c803b2d3dd59c04a06 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 | 10 +++++-----
|
||||
sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
|
||||
sys/decklink/gstdecklinkvideosink.cpp | 2 +-
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
|
||||
index 3f79deb..96600c6 100644
|
||||
--- a/sys/decklink/gstdecklink.cpp
|
||||
+++ b/sys/decklink/gstdecklink.cpp
|
||||
@@ -680,7 +680,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e)
|
||||
"pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
|
||||
"interlace-mode", G_TYPE_STRING,
|
||||
mode->interlaced ? "interleaved" : "progressive",
|
||||
- "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL);
|
||||
+ "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void*)NULL);
|
||||
|
||||
return s;
|
||||
}
|
||||
@@ -705,16 +705,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
|
||||
case bmdFormat8BitYUV: /* '2vuy' */
|
||||
gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
|
||||
"colorimetry", G_TYPE_STRING, mode->colorimetry,
|
||||
- "chroma-site", G_TYPE_STRING, "mpeg2", NULL);
|
||||
+ "chroma-site", G_TYPE_STRING, "mpeg2", (void*)NULL);
|
||||
break;
|
||||
case bmdFormat10BitYUV: /* 'v210' */
|
||||
- gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL);
|
||||
+ gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void*)NULL);
|
||||
break;
|
||||
case bmdFormat8BitARGB: /* 'ARGB' */
|
||||
- gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL);
|
||||
+ gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void*)NULL);
|
||||
break;
|
||||
case bmdFormat8BitBGRA: /* 'BGRA' */
|
||||
- gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL);
|
||||
+ gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void*)NULL);
|
||||
break;
|
||||
case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
|
||||
case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
|
||||
diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
|
||||
index 50ad5cc..d209180 100644
|
||||
--- a/sys/decklink/gstdecklinkaudiosrc.cpp
|
||||
+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
|
||||
@@ -388,7 +388,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
|
||||
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 a64c046..07a09e8 100644
|
||||
--- a/sys/decklink/gstdecklinkvideosink.cpp
|
||||
+++ b/sys/decklink/gstdecklinkvideosink.cpp
|
||||
@@ -288,7 +288,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;
|
||||
}
|
||||
@@ -8,7 +8,6 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues"
|
||||
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
|
||||
file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
|
||||
file://0002-avoid-including-sys-poll.h-directly.patch \
|
||||
file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \
|
||||
file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f"
|
||||
|
||||
Reference in New Issue
Block a user