| Index: webrtc/video/vie_encoder.cc
 | 
| diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
 | 
| index f5bde2e3590cd482030a68aae04d005b191931c7..a3fd98dd6fe5b1c74ebd00de4c55388597949afd 100644
 | 
| --- a/webrtc/video/vie_encoder.cc
 | 
| +++ b/webrtc/video/vie_encoder.cc
 | 
| @@ -410,14 +410,15 @@
 | 
|    pending_encoder_reconfiguration_ = true;
 | 
|  
 | 
|    // Reconfigure the encoder now if the encoder has an internal source or
 | 
| -  // if the frame resolution is known. Otherwise, the reconfiguration is
 | 
| -  // deferred until the next frame to minimize the number of reconfigurations.
 | 
| -  // The codec configuration depends on incoming video frame size.
 | 
| -  if (last_frame_info_) {
 | 
| -    ReconfigureEncoder();
 | 
| -  } else if (settings_.internal_source) {
 | 
| -    last_frame_info_ = rtc::Optional<VideoFrameInfo>(
 | 
| -        VideoFrameInfo(1, 1, kVideoRotation_0, true));
 | 
| +  // if this is the first time the encoder is configured.
 | 
| +  // Otherwise, the reconfiguration is deferred until the next frame to minimize
 | 
| +  // the number of reconfigurations. The codec configuration depends on incoming
 | 
| +  // video frame size.
 | 
| +  if (!last_frame_info_ || settings_.internal_source) {
 | 
| +    if (!last_frame_info_) {
 | 
| +      last_frame_info_ = rtc::Optional<VideoFrameInfo>(
 | 
| +          VideoFrameInfo(176, 144, kVideoRotation_0, false));
 | 
| +    }
 | 
|      ReconfigureEncoder();
 | 
|    }
 | 
|  }
 | 
| @@ -541,7 +542,7 @@
 | 
|    if (pre_encode_callback_)
 | 
|      pre_encode_callback_->OnFrame(video_frame);
 | 
|  
 | 
| -  if (!last_frame_info_ || video_frame.width() != last_frame_info_->width ||
 | 
| +  if (video_frame.width() != last_frame_info_->width ||
 | 
|        video_frame.height() != last_frame_info_->height ||
 | 
|        video_frame.rotation() != last_frame_info_->rotation ||
 | 
|        video_frame.is_texture() != last_frame_info_->is_texture) {
 | 
| 
 |