diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-12-20 23:02:38 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-05 13:54:06 +0000 |
commit | b4a795aa0cbee4938df37e87c355476dedf3f827 (patch) | |
tree | 183549516856e335069b7e9a9261dac4a3964fb4 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad | |
parent | e8852827fc56e2e3c8769c252761dca56b689261 (diff) | |
download | poky-b4a795aa0cbee4938df37e87c355476dedf3f827.tar.gz |
gstreamer: Upgrade to 1.10.2
(From OE-Core rev: fcba432ed28d0249198de0b6b3d1b1c0a87c02a6)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.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.patch | 34 |
1 files changed, 18 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 59321f704b..20c9ffcd84 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 | |||
@@ -23,42 +23,44 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
23 | sys/decklink/gstdecklinkvideosink.cpp | 2 +- | 23 | sys/decklink/gstdecklinkvideosink.cpp | 2 +- |
24 | 3 files changed, 7 insertions(+), 7 deletions(-) | 24 | 3 files changed, 7 insertions(+), 7 deletions(-) |
25 | 25 | ||
26 | Index: gst-plugins-bad-1.10.1/sys/decklink/gstdecklink.cpp | 26 | Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp |
27 | =================================================================== | 27 | =================================================================== |
28 | --- gst-plugins-bad-1.10.1.orig/sys/decklink/gstdecklink.cpp | 28 | --- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp |
29 | +++ gst-plugins-bad-1.10.1/sys/decklink/gstdecklink.cpp | 29 | +++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp |
30 | @@ -476,22 +476,22 @@ gst_decklink_mode_get_structure (GstDeck | 30 | @@ -476,7 +476,7 @@ gst_decklink_mode_get_structure (GstDeck |
31 | "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, | 31 | "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, |
32 | "interlace-mode", G_TYPE_STRING, | 32 | "interlace-mode", G_TYPE_STRING, |
33 | mode->interlaced ? "interleaved" : "progressive", | 33 | mode->interlaced ? "interleaved" : "progressive", |
34 | - "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL); | 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); | 35 | + "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void*)NULL); |
36 | 36 | ||
37 | switch (f) { | 37 | if (input && mode->interlaced) { |
38 | if (mode->tff) | ||
39 | @@ -489,16 +489,16 @@ gst_decklink_mode_get_structure (GstDeck | ||
38 | case bmdFormat8BitYUV: /* '2vuy' */ | 40 | case bmdFormat8BitYUV: /* '2vuy' */ |
39 | gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", | 41 | gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", |
40 | "colorimetry", G_TYPE_STRING, mode->colorimetry, | 42 | "colorimetry", G_TYPE_STRING, mode->colorimetry, |
41 | - "chroma-site", G_TYPE_STRING, "mpeg2", NULL); | 43 | - "chroma-site", G_TYPE_STRING, "mpeg2", NULL); |
42 | + "chroma-site", G_TYPE_STRING, "mpeg2", (void *)NULL); | 44 | + "chroma-site", G_TYPE_STRING, "mpeg2", (void*)NULL); |
43 | break; | 45 | break; |
44 | case bmdFormat10BitYUV: /* 'v210' */ | 46 | case bmdFormat10BitYUV: /* 'v210' */ |
45 | - gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL); | 47 | - gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL); |
46 | + gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void *)NULL); | 48 | + gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void*)NULL); |
47 | break; | 49 | break; |
48 | case bmdFormat8BitARGB: /* 'ARGB' */ | 50 | case bmdFormat8BitARGB: /* 'ARGB' */ |
49 | - gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL); | 51 | - gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL); |
50 | + gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void *)NULL); | 52 | + gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void*)NULL); |
51 | break; | 53 | break; |
52 | case bmdFormat8BitBGRA: /* 'BGRA' */ | 54 | case bmdFormat8BitBGRA: /* 'BGRA' */ |
53 | - gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL); | 55 | - gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL); |
54 | + gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void *)NULL); | 56 | + gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void*)NULL); |
55 | break; | 57 | break; |
56 | case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ | 58 | 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 */ | 59 | case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ |
58 | Index: gst-plugins-bad-1.10.1/sys/decklink/gstdecklinkaudiosrc.cpp | 60 | Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp |
59 | =================================================================== | 61 | =================================================================== |
60 | --- gst-plugins-bad-1.10.1.orig/sys/decklink/gstdecklinkaudiosrc.cpp | 62 | --- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp |
61 | +++ gst-plugins-bad-1.10.1/sys/decklink/gstdecklinkaudiosrc.cpp | 63 | +++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp |
62 | @@ -322,7 +322,7 @@ gst_decklink_audio_src_set_caps (GstBase | 64 | @@ -322,7 +322,7 @@ gst_decklink_audio_src_set_caps (GstBase |
63 | g_mutex_unlock (&self->input->lock); | 65 | g_mutex_unlock (&self->input->lock); |
64 | 66 | ||
@@ -68,10 +70,10 @@ Index: gst-plugins-bad-1.10.1/sys/decklink/gstdecklinkaudiosrc.cpp | |||
68 | gst_object_unref (videosrc); | 70 | gst_object_unref (videosrc); |
69 | 71 | ||
70 | switch (vconn) { | 72 | switch (vconn) { |
71 | Index: gst-plugins-bad-1.10.1/sys/decklink/gstdecklinkvideosink.cpp | 73 | Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp |
72 | =================================================================== | 74 | =================================================================== |
73 | --- gst-plugins-bad-1.10.1.orig/sys/decklink/gstdecklinkvideosink.cpp | 75 | --- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp |
74 | +++ gst-plugins-bad-1.10.1/sys/decklink/gstdecklinkvideosink.cpp | 76 | +++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp |
75 | @@ -163,7 +163,7 @@ reset_framerate (GstCapsFeatures * featu | 77 | @@ -163,7 +163,7 @@ reset_framerate (GstCapsFeatures * featu |
76 | gpointer user_data) | 78 | gpointer user_data) |
77 | { | 79 | { |