From 146e0fd30f5ff4fb47e0ec8dc824e4d9178c828d Mon Sep 17 00:00:00 2001 From: "pthatcher@webrtc.org" Date: Mon, 1 Dec 2014 20:07:52 +0000 Subject: [PATCH] Fix the build by putting in a typecast to avoid a comparison between signed and unsigned ints introduced in cl/81073932. R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/26279004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7776 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 0926b071a..d73b43b09 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -3901,10 +3901,12 @@ bool WebRtcVideoMediaChannel::SetSendParams( // others expect behavior from the adapter different than what it // actually does. We should fix the tests and remove this block. VideoFormat max = send_channel->adapt_format(); + size_t max_width = static_cast(max.width); + size_t max_height = static_cast(max.height); if ((!frame.screencast && - (frame.width > max.width || frame.height > max.height))) { - frame.width = max.width; - frame.height = max.height; + (frame.width > max_width || frame.height > max_height))) { + frame.width = max_width; + frame.height = max_height; } webrtc::VideoCodec codec;