aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/remote_bitrate_estimator/include
diff options
context:
space:
mode:
authorsolenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-04-18 19:12:42 +0000
committersolenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-04-18 19:12:42 +0000
commit975601771718cccaed6cd8124507a1d8daf6fae5 (patch)
tree48066201f3da9fe19068bf712e03334ad163b9a1 /webrtc/modules/remote_bitrate_estimator/include
parentd26457fdebc48ec8801b5be9af4b2b0b69dabfb8 (diff)
downloadwebrtc-975601771718cccaed6cd8124507a1d8daf6fae5.tar.gz
- Replace the BWE_MIN and BWE_MAX macros with std::min and std::max
- Add 'virtual' to a bunch of overridden methods of RemoteBitrateEstimatorMultiStream and RemoteBitrateEstimatorSingleStream. BUG= Review URL: https://webrtc-codereview.appspot.com/1324005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3871 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/remote_bitrate_estimator/include')
-rw-r--r--webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
index 6c3dc40042..59d1a2678a 100644
--- a/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
+++ b/webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h
@@ -13,9 +13,6 @@
#include "typedefs.h"
-#define BWE_MAX(a,b) ((a)>(b)?(a):(b))
-#define BWE_MIN(a,b) ((a)<(b)?(a):(b))
-
namespace webrtc {
enum BandwidthUsage
{