summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2014-11-24 02:52:24 +1100
committerMatthew Waters <matthew@centricular.com>2014-11-24 02:52:24 +1100
commit59085936b820e02734097c17d6dfeb2387f22d9f (patch)
tree514a3bd71e5ada2b83f17bf606b56e8827e2c3c7
parent810d38c29ff6108820ac41710f276c6163acb55c (diff)
glshadervariables: also trim \r as well as \n
-rw-r--r--gst-libs/gst/gl/gstglshadervariables.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstglshadervariables.c b/gst-libs/gst/gl/gstglshadervariables.c
index 4ca2efe71..d6ad879ce 100644
--- a/gst-libs/gst/gl/gstglshadervariables.c
+++ b/gst-libs/gst/gl/gstglshadervariables.c
@@ -184,7 +184,7 @@ gst_gl_shadervariables_parse (GstGLShader * shader, char *variables,
return 0;
p0 = variables;
- trimright (p0, " \t\n");
+ trimright (p0, " \t\r\n");
lim = variables + strlen (variables);
e = strchr (p0, ';');
while (p0 < lim) {
@@ -201,13 +201,13 @@ gst_gl_shadervariables_parse (GstGLShader * shader, char *variables,
e[1] = e1;
trimright (p, " \t");
- trimleft (p, " \t\n");
+ trimleft (p, " \t\r\n");
t = strtok_r (p, " \t", &saveptr);
if (!t)
goto parse_error;
trimleft (t, " \t");
- trimright (t, " \t\n");
+ trimright (t, " \t\r\n");
if (t[0]) {
@@ -318,7 +318,7 @@ parse_error:
t = p = p0;
} else {
e[1] = 0;
- trimleft (p0, " \t\n");
+ trimleft (p0, " \t\r\n");
GST_ERROR ("\n%s", p0);
e[1] = e1;
}