Index: webrtc/media/base/videocommon.cc |
diff --git a/talk/media/base/videocommon.cc b/webrtc/media/base/videocommon.cc |
similarity index 98% |
rename from talk/media/base/videocommon.cc |
rename to webrtc/media/base/videocommon.cc |
index faf6450b567d705f0fb9a20234de276c8919a576..d8cecd4c8502fba413ab57cfb4a80cd814e0501f 100644 |
--- a/talk/media/base/videocommon.cc |
+++ b/webrtc/media/base/videocommon.cc |
@@ -25,7 +25,7 @@ |
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#include "talk/media/base/videocommon.h" |
+#include "webrtc/media/base/videocommon.h" |
#include <limits.h> // For INT_MAX |
#include <math.h> |
@@ -59,7 +59,7 @@ static const FourCCAliasEntry kFourCCAliases[] = { |
}; |
uint32_t CanonicalFourCC(uint32_t fourcc) { |
- for (int i = 0; i < arraysize(kFourCCAliases); ++i) { |
+ for (uint32_t i = 0; i < arraysize(kFourCCAliases); ++i) { |
if (kFourCCAliases[i].alias == fourcc) { |
return kFourCCAliases[i].canonical; |
} |