Merge branch 'master' of github.com:mltframework/shotcut

mltframework · Aug 1, 2014 · 1b9ea49 · 1b9ea49
2 parents 2c1376b + cf6956b
commit 1b9ea49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/scripts/build-shotcut.sh b/scripts/build-shotcut.sh
@@ -584,9 +584,6 @@ function set_globals {
   elif [ "$TARGET_OS" = "Win32" ]; then
     # DEFINES+=QT_STATIC is for QWebSockets
     CONFIG[7]="$QMAKE -r -spec mingw CONFIG+=link_pkgconfig PKGCONFIG+=mlt++ LIBS+=-L${QTDIR}/lib SHOTCUT_VERSION=$(date '+%y.%m.%d') DEFINES+=QT_STATIC"
-  elif [ "$(which qmake-qt5)" != "" ]; then
-    CONFIG[7]="qmake-qt5 -r"
-    LD_LIBRARY_PATH_[7]="/usr/local/lib"
   else
     CONFIG[7]="$QTDIR/bin/qmake -r"
     LD_LIBRARY_PATH_[7]="/usr/local/lib"
@@ -606,8 +603,6 @@ function set_globals {
     CONFIG[9]="$QTDIR/bin/qmake -r -spec macx-g++ MLT_PREFIX=$FINAL_INSTALL_DIR"
   elif [ "$TARGET_OS" = "Win32" ]; then
     CONFIG[9]="$QMAKE -r -spec mingw LIBS+=-L${QTDIR}/lib INCLUDEPATH+=$FINAL_INSTALL_DIR/include"
-  elif [ "$(which qmake-qt5)" != "" ]; then
-    CONFIG[9]="qmake-qt5 -r"
   else
     CONFIG[9]="$QTDIR/bin/qmake -r"
   fi

diff --git a/src/glwidget.cpp b/src/glwidget.cpp
@@ -240,11 +240,11 @@ void GLWidget::createShader()
         "void main(void) {"
         "  float x = gl_TexCoord[0].x;"
         "  float y = gl_TexCoord[0].y;"
-        "  vec4 input;"
-        "  input.r = texture2D(Ytex, vec2(x, y)).r - 0.0625;" // Y
-        "  input.g = texture2D(Utex, vec2(x, y)).r - 0.5;"    // U
-        "  input.b = texture2D(Vtex, vec2(x, y)).r - 0.5;"    // V
-        "  input.a  = 1.0;"
+        "  vec4 pixel;"
+        "  pixel.r = texture2D(Ytex, vec2(x, y)).r - 0.0625;" // Y
+        "  pixel.g = texture2D(Utex, vec2(x, y)).r - 0.5;"    // U
+        "  pixel.b = texture2D(Vtex, vec2(x, y)).r - 0.5;"    // V
+        "  pixel.a  = 1.0;"
         "  mat4 coefficients;"
         "  if (colorspace == 601) {"
         "    coefficients = mat4("
@@ -259,7 +259,7 @@ void GLWidget::createShader()
         "      1.793, -0.533,  0.0,    0.0," // column 3
         "      0.0,    0.0,    0.0,    1.0);"// column 4
         "  }"
-        "  gl_FragColor = coefficients * input;"
+        "  gl_FragColor = coefficients * pixel;"
         "}");
         m_shader->bind();
         doneCurrent();