summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch')
-rwxr-xr-xmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch
deleted file mode 100755
index b75f402d82..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-glcolorconvert-don-t-use-the-predefined-variable-nam.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From b069672ace2b762f400ca6d318571cbedf5141f2 Mon Sep 17 00:00:00 2001
2From: Matthew Waters <matthew@centricular.com>
3Date: Thu, 31 Mar 2016 20:00:37 +1100
4Subject: [PATCH 1/3] glcolorconvert: don't use the predefined variable name
5 sample
6
7Using 'sample' as a variable name is an error in GLES3
8
9Upstream-Status: Backport [1.9.1]
10---
11 gst-libs/gst/gl/gstglcolorconvert.c | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c
15index f478faa..c23624f 100644
16--- a/gst-libs/gst/gl/gstglcolorconvert.c
17+++ b/gst-libs/gst/gl/gstglcolorconvert.c
18@@ -261,9 +261,9 @@ static const struct shader_templ templ_RGB_to_PLANAR_YUV =
19 " for (int j = 0; j < int(chroma_sampling.y); j++) {\n"
20 " int n = (i+1)*(j+1);\n"
21 " delta.y = float(j);\n"
22- " vec4 sample = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n"
23+ " vec4 s = texture2D(tex, (chroma_pos + delta) / unnormalization).%c%c%c%c;\n"
24 /* rolling average */
25- " uv_texel = (float(n-1) * uv_texel + sample) / float(n);\n"
26+ " uv_texel = (float(n-1) * uv_texel + s) / float(n);\n"
27 " }\n"
28 " }\n"
29 "}\n"
30--
311.9.1
32