Move talk/media to webrtc/media

webrtc/media/webrtc/simulcast.cc

Index: webrtc/media/webrtc/simulcast.cc
diff --git a/talk/media/webrtc/simulcast.cc b/webrtc/media/webrtc/simulcast.cc
old mode 100755
new mode 100644
similarity index 97%
rename from talk/media/webrtc/simulcast.cc
rename to webrtc/media/webrtc/simulcast.cc
index b67a363a763eebc345dbd4237c8af988566c5627..3619bd2a07c7674567ae9d642fbe5ed151888d50
--- a/talk/media/webrtc/simulcast.cc
+++ b/webrtc/media/webrtc/simulcast.cc
@@ -27,11 +27,11 @@
 
 #include <stdio.h>
 
-#include "talk/media/base/streamparams.h"
-#include "talk/media/webrtc/simulcast.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/media/base/streamparams.h"
+#include "webrtc/media/webrtc/simulcast.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace cricket {
@@ -95,7 +95,7 @@ void MaybeExchangeWidthHeight(int* width, int* height) {
 int FindSimulcastFormatIndex(int width, int height) {
   MaybeExchangeWidthHeight(&width, &height);
 
-  for (int i = 0; i < arraysize(kSimulcastFormats); ++i) {
+  for (uint32_t i = 0; i < arraysize(kSimulcastFormats); ++i) {
     if (width >= kSimulcastFormats[i].width &&
         height >= kSimulcastFormats[i].height) {
       return i;
@@ -107,7 +107,7 @@ int FindSimulcastFormatIndex(int width, int height) {
 int FindSimulcastFormatIndex(int width, int height, size_t max_layers) {
   MaybeExchangeWidthHeight(&width, &height);
 
-  for (int i = 0; i < arraysize(kSimulcastFormats); ++i) {
+  for (uint32_t i = 0; i < arraysize(kSimulcastFormats); ++i) {
     if (width >= kSimulcastFormats[i].width &&
         height >= kSimulcastFormats[i].height &&
         max_layers == kSimulcastFormats[i].max_layers) {