| Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc
 | 
| diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc
 | 
| index fec32261b767635b20f88e4337aa72d66fc31c80..69e52a5b2748f255c4871c94aabfc3a155145987 100644
 | 
| --- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc
 | 
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc
 | 
| @@ -136,10 +136,10 @@ bool CopyVideoFrameToPixelBuffer(const webrtc::VideoFrame& frame,
 | 
|      LOG(LS_ERROR) << "Failed to lock base address: " << cvRet;
 | 
|      return false;
 | 
|    }
 | 
| -  uint8* dst_y = reinterpret_cast<uint8*>(
 | 
| +  uint8_t* dst_y = reinterpret_cast<uint8_t*>(
 | 
|        CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 0));
 | 
|    int dst_stride_y = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 0);
 | 
| -  uint8* dst_uv = reinterpret_cast<uint8*>(
 | 
| +  uint8_t* dst_uv = reinterpret_cast<uint8_t*>(
 | 
|        CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 1));
 | 
|    int dst_stride_uv = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);
 | 
|    // Convert I420 to NV12.
 | 
| 
 |