Merge lp:~jhodapp/qtvideo-node/nexus7-video-fix into lp:qtvideo-node

[Jim Hodapp]

Fix video playback so that it works on the Nexus 7 device. Audio still does not work. The GL_OES_EGL_image_external OpenGL extension should never have been included in the first place for the shader.

Fix video playback so that it works on the Nexus 7 device. Audio still does not work. The GL_OES_EGL_image_external OpenGL extension should never have been included in the first place for the shader.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtvideo-node-quantal-armhf-ci/9/console
        deb: http://jenkins.qa.ubuntu.com/job/qtvideo-node-quantal-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/qtvideo-node-ci/9/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

Camera and media player work fine on Nexus 10

review: Approve

=== modified file 'src/shadervideoshader.cpp'
--- src/shadervideoshader.cpp	2013-02-12 14:04:56 +0000
+++ src/shadervideoshader.cpp	2013-03-18 19:19:22 +0000
@@ -56,7 +56,6 @@
 const char *ShaderVideoShader::vertexShader() const
 {
     const char *shader =
-        "#extension GL_OES_EGL_image_external : require     \n"
         "uniform highp mat4 qt_Matrix;                      \n"
         "attribute highp vec4 qt_VertexPosition;            \n"
         "attribute highp vec2 qt_VertexTexCoord;            \n"