summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-19 18:53:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-22 20:42:47 +0000
commit6456a6fe2149a1e28b4e253097d1159472a8ca9a (patch)
treeea0170ab7970ef36d47b0c977e349b92b917a2e1 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
parent821498f1d5ed7fd8490dc1c2f4f0d5ec69092002 (diff)
downloadpoky-6456a6fe2149a1e28b4e253097d1159472a8ca9a.tar.gz
gstreamer1.0-plugins-bad_git: update 1.7.1 -> 1.7.2
(From OE-Core rev: f5095eb11215c3aad76edd33cdccbb5dca8296cf) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch51
1 files changed, 35 insertions, 16 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
index 8ccaaa0598..369ff93ac1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
@@ -1,4 +1,4 @@
1From 3164f23cd6ae338d0e423fccb4e11539cd220e2f Mon Sep 17 00:00:00 2001 1From 2262ba4b686d5cc0d3e894707fe1d31619a3a8f1 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
@@ -18,26 +18,45 @@ Upstream-Status: Pending
18 18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20--- 20---
21 sys/decklink/gstdecklink.cpp | 2 +- 21 sys/decklink/gstdecklink.cpp | 10 +++++-----
22 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- 22 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
23 sys/decklink/gstdecklinkvideosink.cpp | 2 +- 23 sys/decklink/gstdecklinkvideosink.cpp | 2 +-
24 3 files changed, 3 insertions(+), 3 deletions(-) 24 3 files changed, 7 insertions(+), 7 deletions(-)
25 25
26diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp 26diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
27index c0d1128..6f2ef75 100644 27index 64637f1..bac956f 100644
28--- a/sys/decklink/gstdecklink.cpp 28--- a/sys/decklink/gstdecklink.cpp
29+++ b/sys/decklink/gstdecklink.cpp 29+++ b/sys/decklink/gstdecklink.cpp
30@@ -328,7 +328,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e) 30@@ -324,22 +324,22 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f)
31 "interlace-mode", G_TYPE_STRING, 31 "height", G_TYPE_INT, mode->height,
32 mode->interlaced ? "interleaved" : "progressive", "pixel-aspect-ratio", 32 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
33 GST_TYPE_FRACTION, mode->par_n, mode->par_d, "colorimetry", G_TYPE_STRING, 33 "interlace-mode", G_TYPE_STRING, mode->interlaced ? "interleaved" : "progressive",
34- mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", NULL); 34- "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL);
35+ mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", (void *) NULL); 35+ "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void *) NULL);
36 }
37 36
38 GstCaps * 37 switch (f) {
38 case bmdFormat8BitYUV: /* '2vuy' */
39 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
40 "colorimetry", G_TYPE_STRING, mode->colorimetry,
41- "chroma-site", G_TYPE_STRING, "mpeg2", NULL);
42+ "chroma-site", G_TYPE_STRING, "mpeg2", (void *) NULL);
43 break;
44 case bmdFormat10BitYUV: /* 'v210' */
45- gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL);
46+ gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void *) NULL);
47 break;
48 case bmdFormat8BitARGB: /* 'ARGB' */
49- gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL);
50+ gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void *) NULL);
51 break;
52 case bmdFormat8BitBGRA: /* 'BGRA' */
53- gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL);
54+ gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void *) NULL);
55 break;
56 case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
57 case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
39diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp 58diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
40index e5ac8ae..a153851 100644 59index 9a701ee..26fb7ec 100644
41--- a/sys/decklink/gstdecklinkaudiosrc.cpp 60--- a/sys/decklink/gstdecklinkaudiosrc.cpp
42+++ b/sys/decklink/gstdecklinkaudiosrc.cpp 61+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
43@@ -312,7 +312,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps) 62@@ -312,7 +312,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
@@ -50,7 +69,7 @@ index e5ac8ae..a153851 100644
50 69
51 switch (vconn) { 70 switch (vconn) {
52diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp 71diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
53index 7111cb1..b958fda 100644 72index eebeff3..da6e486 100644
54--- a/sys/decklink/gstdecklinkvideosink.cpp 73--- a/sys/decklink/gstdecklinkvideosink.cpp
55+++ b/sys/decklink/gstdecklinkvideosink.cpp 74+++ b/sys/decklink/gstdecklinkvideosink.cpp
56@@ -158,7 +158,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, 75@@ -158,7 +158,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,