From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 16:25:10 +0100
Subject: Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
---
 Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp')

diff --git a/Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp b/Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
index 99e3e1e..86545b7 100644
--- a/Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
+++ b/Source/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
@@ -111,6 +111,7 @@ const IntSize VideoFrameChromiumImpl::requiredTextureSize(unsigned plane) const
 {
     switch (format()) {
     case RGBA:
+    case YV16:
         return IntSize(stride(plane), height());
     case YV12:
         if (plane == static_cast<unsigned>(yPlane))
-- 
cgit v1.1