diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 17:29:00 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 17:29:00 +0000 |
| commit | 305ddf7c77a2f082499c584ef00b25cad63654cb (patch) | |
| tree | eb3da0a7d0f5f4bb45ab1fd986af2590ebb4c3ac /media/tools | |
| parent | ea6089c7c205c2cbfd1470c430bfe16f97e46370 (diff) | |
| download | chromium_src-305ddf7c77a2f082499c584ef00b25cad63654cb.zip chromium_src-305ddf7c77a2f082499c584ef00b25cad63654cb.tar.gz chromium_src-305ddf7c77a2f082499c584ef00b25cad63654cb.tar.bz2 | |
Reverting 53348...
Broke webkit build.
BUG=None
TEST=Nont
TBR=jiesun
Review URL: http://codereview.chromium.org/3015018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/gles_video_renderer.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/media/tools/player_x11/gles_video_renderer.cc b/media/tools/player_x11/gles_video_renderer.cc index a702c77..f1942ba 100644 --- a/media/tools/player_x11/gles_video_renderer.cc +++ b/media/tools/player_x11/gles_video_renderer.cc @@ -432,17 +432,10 @@ void GlesVideoRenderer::CreateTextureAndProgramEgl() { scoped_refptr<media::VideoFrame> video_frame; const base::TimeDelta kZero; - // The data/strides are not relevant in this case. - uint8* data[media::VideoFrame::kMaxPlanes]; - int32 strides[media::VideoFrame::kMaxPlanes]; - memset(data, 0, sizeof(data)); - memset(strides, 0, sizeof(strides)); - media::VideoFrame:: CreateFrameExternal( + media::VideoFrame:: CreatePrivateFrame( media::VideoFrame::TYPE_EGL_IMAGE, media::VideoFrame::RGB565, - width(), height(), 3, - data, strides, - kZero, kZero, + width(), height(), kZero, kZero, egl_image, &video_frame); egl_frames_.push_back(std::make_pair(video_frame, texture)); |