diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch deleted file mode 100644 index 88fbc40dc..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch +++ /dev/null | |||
| @@ -1,88 +0,0 @@ | |||
| 1 | From 5ed27de9f662fe063b8b3d5d4335aa64cd4718c9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
| 3 | Date: Tue, 9 Feb 2016 14:00:00 -0800 | ||
| 4 | Subject: [PATCH 3/4] ensure valid sentinals for gst_structure_get() etc | ||
| 5 | |||
| 6 | For GStreamer functions declared with G_GNUC_NULL_TERMINATED, | ||
| 7 | ie __attribute__((__sentinel__)), gcc will generate a warning if the | ||
| 8 | last parameter passed to the function is not NULL (where a valid NULL | ||
| 9 | in this context is defined as zero with any pointer type). | ||
| 10 | |||
| 11 | The C callers to such functions within gst-plugins-bad use the C NULL | ||
| 12 | definition (ie ((void*)0)), which is a valid sentinel. | ||
| 13 | |||
| 14 | However the C++ NULL definition (ie 0L), is not a valid sentinel | ||
| 15 | without an explicit cast to a pointer type. | ||
| 16 | |||
| 17 | Upstream-Status: Pending | ||
| 18 | |||
| 19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
| 20 | --- | ||
| 21 | sys/decklink/gstdecklink.cpp | 10 +++++----- | ||
| 22 | sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- | ||
| 23 | sys/decklink/gstdecklinkvideosink.cpp | 2 +- | ||
| 24 | 3 files changed, 7 insertions(+), 7 deletions(-) | ||
| 25 | |||
| 26 | diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp | ||
| 27 | index 4dac7e1..43762ce 100644 | ||
| 28 | --- a/sys/decklink/gstdecklink.cpp | ||
| 29 | +++ b/sys/decklink/gstdecklink.cpp | ||
| 30 | @@ -674,7 +674,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e) | ||
| 31 | "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, | ||
| 32 | "interlace-mode", G_TYPE_STRING, | ||
| 33 | mode->interlaced ? "interleaved" : "progressive", | ||
| 34 | - "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL); | ||
| 35 | + "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void*)NULL); | ||
| 36 | |||
| 37 | return s; | ||
| 38 | } | ||
| 39 | @@ -699,16 +699,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f, | ||
| 40 | case bmdFormat8BitYUV: /* '2vuy' */ | ||
| 41 | gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", | ||
| 42 | "colorimetry", G_TYPE_STRING, mode->colorimetry, | ||
| 43 | - "chroma-site", G_TYPE_STRING, "mpeg2", NULL); | ||
| 44 | + "chroma-site", G_TYPE_STRING, "mpeg2", (void*)NULL); | ||
| 45 | break; | ||
| 46 | case bmdFormat10BitYUV: /* 'v210' */ | ||
| 47 | - gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL); | ||
| 48 | + gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void*)NULL); | ||
| 49 | break; | ||
| 50 | case bmdFormat8BitARGB: /* 'ARGB' */ | ||
| 51 | - gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL); | ||
| 52 | + gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void*)NULL); | ||
| 53 | break; | ||
| 54 | case bmdFormat8BitBGRA: /* 'BGRA' */ | ||
| 55 | - gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL); | ||
| 56 | + gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void*)NULL); | ||
| 57 | break; | ||
| 58 | case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ | ||
| 59 | case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ | ||
| 60 | diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp | ||
| 61 | index 2fef934..c47229a 100644 | ||
| 62 | --- a/sys/decklink/gstdecklinkaudiosrc.cpp | ||
| 63 | +++ b/sys/decklink/gstdecklinkaudiosrc.cpp | ||
| 64 | @@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self) | ||
| 65 | g_mutex_unlock (&self->input->lock); | ||
| 66 | |||
| 67 | if (videosrc) { | ||
| 68 | - g_object_get (videosrc, "connection", &vconn, NULL); | ||
| 69 | + g_object_get (videosrc, "connection", &vconn, (void *) NULL); | ||
| 70 | gst_object_unref (videosrc); | ||
| 71 | |||
| 72 | switch (vconn) { | ||
| 73 | diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp | ||
| 74 | index e3a6775..f1a5aae 100644 | ||
| 75 | --- a/sys/decklink/gstdecklinkvideosink.cpp | ||
| 76 | +++ b/sys/decklink/gstdecklinkvideosink.cpp | ||
| 77 | @@ -286,7 +286,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, | ||
| 78 | gpointer user_data) | ||
| 79 | { | ||
| 80 | gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, | ||
| 81 | - G_MAXINT, 1, NULL); | ||
| 82 | + G_MAXINT, 1, (void *) NULL); | ||
| 83 | |||
| 84 | return TRUE; | ||
| 85 | } | ||
| 86 | -- | ||
| 87 | 2.28.0 | ||
| 88 | |||
