Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

webkit/media/webvideoframe_impl.cc

Index: webkit/media/webvideoframe_impl.cc
diff --git a/webkit/media/webvideoframe_impl.cc b/webkit/media/webvideoframe_impl.cc
index d6e178c24cdcd433c4c6feb47d72d835bb422957..23df382e376cefd2eff395e4cfc89797458fb04c 100644
--- a/webkit/media/webvideoframe_impl.cc
+++ b/webkit/media/webvideoframe_impl.cc
@@ -73,6 +73,14 @@ unsigned WebVideoFrameImpl::planes() const {
       break;
     case media::VideoFrame::NATIVE_TEXTURE:
       return 0;
+    case media::VideoFrame::kColorUnknown:
+    case media::VideoFrame::kI420:
+    case media::VideoFrame::kYUY2:
+    case media::VideoFrame::kUYVY:
+    case media::VideoFrame::kRGB24:
+    case media::VideoFrame::kARGB:
+    case media::VideoFrame::kMJPEG:
+      break;
   }
   NOTREACHED();
   return 0;