Index: content/renderer/media/media_stream_video_source.cc |
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc |
index e23794511ee5e07236fce83c5fd6b24f3b1fda5a..987de9d81912321222c01327a2525a1c03743d47 100644 |
--- a/content/renderer/media/media_stream_video_source.cc |
+++ b/content/renderer/media/media_stream_video_source.cc |
@@ -39,11 +39,6 @@ const char* kSupportedConstraints[] = { |
MediaStreamVideoSource::kMinFrameRate, |
}; |
-const int MediaStreamVideoSource::kDefaultWidth = 640; |
-const int MediaStreamVideoSource::kDefaultHeight = 480; |
-const int MediaStreamVideoSource::kDefaultFrameRate = 30; |
-const int MediaStreamVideoSource::kUnknownFrameRate = 0; |
- |
namespace { |
// Google-specific key prefix. Constraints with this prefix are ignored if they |
@@ -334,8 +329,10 @@ void GetBestCaptureFormat( |
*capture_format = GetBestFormatBasedOnArea( |
formats, |
- std::min(max_width, MediaStreamVideoSource::kDefaultWidth) * |
- std::min(max_height, MediaStreamVideoSource::kDefaultHeight)); |
+ std::min(max_width, |
+ static_cast<int>(MediaStreamVideoSource::kDefaultWidth)) * |
+ std::min(max_height, |
+ static_cast<int>(MediaStreamVideoSource::kDefaultHeight))); |
} |
} // anonymous namespace |