Move talk/media to webrtc/media

webrtc/media/base/videoadapter.cc

Index: webrtc/media/base/videoadapter.cc
diff --git a/talk/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
similarity index 98%
rename from talk/media/base/videoadapter.cc
rename to webrtc/media/base/videoadapter.cc
index edeed637221b04ebd6cf6fc74a36b9338c4c7235..89a4493108edc1d56661942fe8c2b0e4ec7733f6 100644
--- a/talk/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -25,16 +25,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/media/base/videoadapter.h"
+#include "webrtc/media/base/videoadapter.h"
 
 #include <limits.h>  // For INT_MAX
 #include <algorithm>
 
-#include "talk/media/base/constants.h"
-#include "talk/media/base/videocommon.h"
-#include "talk/media/base/videoframe.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/videocommon.h"
+#include "webrtc/media/base/videoframe.h"
 
 namespace cricket {
 
@@ -303,8 +303,8 @@ VideoFormat VideoAdapter::AdaptFrameResolution(int in_width, int in_height) {
 
   const float scale = VideoAdapter::FindClosestViewScale(
       in_width, in_height, output_num_pixels_);
-  const int output_width = static_cast<int>(in_width * scale + .5f);
-  const int output_height = static_cast<int>(in_height * scale + .5f);
+  const size_t output_width = static_cast<size_t>(in_width * scale + .5f);
+  const size_t output_height = static_cast<size_t>(in_height * scale + .5f);
 
   ++frames_out_;
   if (scale != 1)