summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch')
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch35
1 files changed, 18 insertions, 17 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
index 2d5389d9..c25a11e9 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
@@ -1,4 +1,4 @@
1From 2262ba4b686d5cc0d3e894707fe1d31619a3a8f1 Mon Sep 17 00:00:00 2001 1From f9a8b71897af39640894915a5f202d0027124f57 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 9 Feb 2016 14:00:00 -0800 3Date: Tue, 9 Feb 2016 14:00:00 -0800
4Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc 4Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc
@@ -17,17 +17,18 @@ without an explicit cast to a pointer type.
17Upstream-Status: Pending 17Upstream-Status: Pending
18 18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20
20--- 21---
21 sys/decklink/gstdecklink.cpp | 10 +++++----- 22 sys/decklink/gstdecklink.cpp | 10 +++++-----
22 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- 23 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
23 sys/decklink/gstdecklinkvideosink.cpp | 2 +- 24 sys/decklink/gstdecklinkvideosink.cpp | 2 +-
24 3 files changed, 7 insertions(+), 7 deletions(-) 25 3 files changed, 7 insertions(+), 7 deletions(-)
25 26
26Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp 27diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
27=================================================================== 28index 464b0de9d..9fb7246d3 100644
28--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp 29--- a/sys/decklink/gstdecklink.cpp
29+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp 30+++ b/sys/decklink/gstdecklink.cpp
30@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDeck 31@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
31 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, 32 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
32 "interlace-mode", G_TYPE_STRING, 33 "interlace-mode", G_TYPE_STRING,
33 mode->interlaced ? "interleaved" : "progressive", 34 mode->interlaced ? "interleaved" : "progressive",
@@ -36,7 +37,7 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
36 37
37 if (input && mode->interlaced) { 38 if (input && mode->interlaced) {
38 if (mode->tff) 39 if (mode->tff)
39@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDeck 40@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
40 case bmdFormat8BitYUV: /* '2vuy' */ 41 case bmdFormat8BitYUV: /* '2vuy' */
41 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", 42 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
42 "colorimetry", G_TYPE_STRING, mode->colorimetry, 43 "colorimetry", G_TYPE_STRING, mode->colorimetry,
@@ -57,11 +58,11 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
57 break; 58 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 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 case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
60Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp 61diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
61=================================================================== 62index 2fef934c8..c47229abf 100644
62--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp 63--- a/sys/decklink/gstdecklinkaudiosrc.cpp
63+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp 64+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
64@@ -387,7 +387,7 @@ gst_decklink_audio_src_set_caps (GstBase 65@@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
65 g_mutex_unlock (&self->input->lock); 66 g_mutex_unlock (&self->input->lock);
66 67
67 if (videosrc) { 68 if (videosrc) {
@@ -70,11 +71,11 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
70 gst_object_unref (videosrc); 71 gst_object_unref (videosrc);
71 72
72 switch (vconn) { 73 switch (vconn) {
73Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp 74diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
74=================================================================== 75index 7aea3f7a2..4864508bb 100644
75--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp 76--- a/sys/decklink/gstdecklinkvideosink.cpp
76+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp 77+++ b/sys/decklink/gstdecklinkvideosink.cpp
77@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * featu 78@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
78 gpointer user_data) 79 gpointer user_data)
79 { 80 {
80 gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, 81 gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,