286fe0b04d97205ac84688bbe613d5749192b2d1 - src.git

commit	286fe0b04d97205ac84688bbe613d5749192b2d1	[log] [tgz]
author	stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>	Wed Aug 21 20:58:21 2013
committer	stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>	Wed Aug 21 20:58:21 2013
tree	4250b187414ad51b3ed504177d60dab502916f38
parent	dbf6a81cb5a087e929747524822203b919ddf565 [diff]

Revert 4585 "Revert "Revert 4582 "Reverts a second set of reverts caused by a bug in ..."""

...and fixes the RTCP bug.

BUG=2277
TBR=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2089004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4588 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/modules.gyp[diff]
webrtc/modules/rtp_rtcp/interface/receive_statistics.h[diff]
webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h[diff]
webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc[diff]
webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc[diff]
webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h[diff]
webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc[Added - diff]
webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc[diff]
webrtc/modules/rtp_rtcp/source/rtcp_sender.cc[diff]
webrtc/modules/rtp_rtcp/source/rtcp_sender.h[diff]
webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc[diff]
webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc[diff]
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc[diff]
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h[diff]
webrtc/modules/rtp_rtcp/source/rtp_utility.cc[diff]
webrtc/modules/rtp_rtcp/source/rtp_utility.h[diff]
webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc[diff]
webrtc/video_engine/vie_channel.cc[diff]
webrtc/video_engine/vie_channel.h[diff]
webrtc/video_engine/vie_receiver.cc[diff]
webrtc/voice_engine/channel.cc[diff]
webrtc/voice_engine/channel.h[diff]

22 files changed

tree: 4250b187414ad51b3ed504177d60dab502916f38