Index: webrtc/media/engine/webrtcvideoengine2.cc |
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc |
index 9e7f5c4bd45fdb49a2493d94a6a83600073d88b2..9da57af9a2c3eacd715ff6ccc552d34d7565ba41 100644 |
--- a/webrtc/media/engine/webrtcvideoengine2.cc |
+++ b/webrtc/media/engine/webrtcvideoengine2.cc |
@@ -1864,9 +1864,12 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig( |
encoder_config.number_of_streams = 1; |
} |
- int stream_max_bitrate = |
- MinPositive(rtp_parameters_.encodings[0].max_bitrate_bps, |
- parameters_.max_bitrate_bps); |
+ int stream_max_bitrate = parameters_.max_bitrate_bps; |
+ if (rtp_parameters_.encodings[0].max_bitrate_bps) { |
+ stream_max_bitrate = |
+ MinPositive(*(rtp_parameters_.encodings[0].max_bitrate_bps), |
+ parameters_.max_bitrate_bps); |
+ } |
int codec_max_bitrate_kbps; |
if (codec.GetParam(kCodecParamMaxBitrate, &codec_max_bitrate_kbps)) { |