summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1122547
blob: ce65ec961912108282c44dcc3734c72e04a335c6 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
index e68a104..a090241 100644
--- media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+++ media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(
   // Assume that render timing errors are due to changes in the video stream.
   if (next_render_time_ms < 0) {
     timing_error = true;
-  } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
+  } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) >
+             max_video_delay_ms_) {
     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
                  VCMId(vcm_id_, receiver_id_),
                  "This frame is out of our delay bounds, resetting jitter "
                  "buffer: %d > %d",
-                 static_cast<int>(std::abs(next_render_time_ms - now_ms)),
+                 std::abs(static_cast<int>(next_render_time_ms - now_ms)),
                  max_video_delay_ms_);
     timing_error = true;
   } else if (static_cast<int>(timing_->TargetVideoDelay()) >