From 305ddf7c77a2f082499c584ef00b25cad63654cb Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Thu, 22 Jul 2010 17:29:00 +0000 Subject: 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 --- media/tools/player_x11/gles_video_renderer.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'media/tools') 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 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)); -- cgit v1.1