diff options
| author | tnakamura@webrtc.org <tnakamura@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 19:42:30 +0000 |
|---|---|---|
| committer | tnakamura@webrtc.org <tnakamura@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 19:42:30 +0000 |
| commit | 1b4ed025b291d5d226ee45f1f1211becd39a3560 (patch) | |
| tree | c646a4b52362a124d3341e89e43c4dba06c8abd5 | |
| parent | b5f5e9089dca995c3d4a6fe0c266d19b8a088b92 (diff) | |
| download | webrtc-1b4ed025b291d5d226ee45f1f1211becd39a3560.tar.gz | |
Merge r6544 to 3.55 branch.
BUG=3518
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14939004
git-svn-id: http://webrtc.googlecode.com/svn/branches/3.55/webrtc@6655 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | modules/rtp_rtcp/source/rtp_sender.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index 17b026ca..291e619b 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -397,7 +397,7 @@ class RTPSender : public RTPSenderInterface, public Bitrate::Observer { // that by the time the function returns there is no guarantee // that the target bitrate is still valid. scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_; - uint16_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); + uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); }; } // namespace webrtc |