Merge webrtc/video_engine/ into webrtc/video/

talk/media/base/videocommon.cc

Index: talk/media/base/videocommon.cc
diff --git a/talk/media/base/videocommon.cc b/talk/media/base/videocommon.cc
index a4e98154e79e1ff615da36f8a56f8741516a0c51..faf6450b567d705f0fb9a20234de276c8919a576 100644
--- a/talk/media/base/videocommon.cc
+++ b/talk/media/base/videocommon.cc
@@ -107,9 +107,6 @@ void ComputeScaleMaxPixels(int frame_width, int frame_height, int max_pixels,
   ASSERT(scaled_width != NULL);
   ASSERT(scaled_height != NULL);
   ASSERT(max_pixels > 0);
-  // For VP8 the values for max width and height can be found here
-  // webrtc/src/video_engine/vie_defines.h (kViEMaxCodecWidth and
-  // kViEMaxCodecHeight)
   const int kMaxWidth = 4096;
   const int kMaxHeight = 3072;
   int new_frame_width = frame_width;