diff options
| author | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 18:36:44 +0000 |
|---|---|---|
| committer | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 18:36:44 +0000 |
| commit | 3e72a39f9eb9ffa3f92e74dbe30f71fc8ed255d7 (patch) | |
| tree | e8ded440882156dd3cfb2bb9b0d799d156f862e3 /media/tools/player_x11 | |
| parent | 5013153a76e81ecf270d17a55600225556188128 (diff) | |
| download | chromium_src-3e72a39f9eb9ffa3f92e74dbe30f71fc8ed255d7.zip chromium_src-3e72a39f9eb9ffa3f92e74dbe30f71fc8ed255d7.tar.gz chromium_src-3e72a39f9eb9ffa3f92e74dbe30f71fc8ed255d7.tar.bz2 | |
1. make omx engine the driving force to read bit stream
2. update omx_codec_unittest and omx_test correspondingly
3. fix copy&paste error in shader code
BUG=none
TEST=dev platform
Review URL: http://codereview.chromium.org/2752002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11')
| -rw-r--r-- | media/tools/player_x11/gles_video_renderer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tools/player_x11/gles_video_renderer.cc b/media/tools/player_x11/gles_video_renderer.cc index ef02d75..4d14fee 100644 --- a/media/tools/player_x11/gles_video_renderer.cc +++ b/media/tools/player_x11/gles_video_renderer.cc @@ -483,7 +483,7 @@ void GlesVideoRenderer::CreateTextureAndProgramYuv2Rgb() { CreateShader(program, GL_VERTEX_SHADER, kVertexShader, sizeof(kVertexShader)); CreateShader(program, GL_FRAGMENT_SHADER, - kFragmentShaderEgl, sizeof(kFragmentShader)); + kFragmentShader, sizeof(kFragmentShader)); LinkProgram(program); // Bind parameters. |