From b7686af27ca880968557e9362376c0a484a910ca Mon Sep 17 00:00:00 2001 From: "hlundin@google.com" Date: Wed, 15 Jun 2011 11:35:59 +0000 Subject: [PATCH] Remove warnings on Windows Make member variable payload_size_ int instead of unsigned to avoid warnings when comparing (> and >=). Review URL: http://webrtc-codereview.appspot.com/40001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@86 4adac7df-926f-26a2-2b94-8c16560cd09d --- modules/rtp_rtcp/source/rtp_format_vp8.cc | 6 +++--- modules/rtp_rtcp/source/rtp_format_vp8.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc index 9232a4b92..6939a5b50 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.cc +++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc @@ -30,7 +30,7 @@ RtpFormatVp8::RtpFormatVp8(const WebRtc_UWord8* payload_data, const RTPFragmentationHeader& fragmentation, VP8PacketizerMode mode) : payload_data_(payload_data), - payload_size_(payload_size), + payload_size_(static_cast(payload_size)), payload_bytes_sent_(0), part_ix_(0), beginning_(true), @@ -46,7 +46,7 @@ RtpFormatVp8::RtpFormatVp8(const WebRtc_UWord8* payload_data, RtpFormatVp8::RtpFormatVp8(const WebRtc_UWord8* payload_data, WebRtc_UWord32 payload_size) : payload_data_(payload_data), - payload_size_(payload_size), + payload_size_(static_cast(payload_size)), part_info_(), payload_bytes_sent_(0), part_ix_(0), @@ -58,7 +58,7 @@ RtpFormatVp8::RtpFormatVp8(const WebRtc_UWord8* payload_data, separate_first_(sep_first_modes_[kSloppy]) { part_info_.VerifyAndAllocateFragmentationHeader(1); - part_info_.fragmentationLength[0] = payload_size_; + part_info_.fragmentationLength[0] = payload_size; part_info_.fragmentationOffset[0] = 0; } diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h index 4f2e193c0..98c0b1fb0 100644 --- a/modules/rtp_rtcp/source/rtp_format_vp8.h +++ b/modules/rtp_rtcp/source/rtp_format_vp8.h @@ -89,7 +89,7 @@ private: WebRtc_UWord8* buffer); const WebRtc_UWord8* payload_data_; - const WebRtc_UWord32 payload_size_; + const int payload_size_; RTPFragmentationHeader part_info_; int payload_bytes_sent_; int part_ix_;