| Index: webrtc/modules/video_coding/generic_decoder.cc | 
| diff --git a/webrtc/modules/video_coding/generic_decoder.cc b/webrtc/modules/video_coding/generic_decoder.cc | 
| index b95571b8f73793718d318eedc82fff249e9a9f17..b1059e8a1b6997a378b85400d57860a5b7cdf878 100644 | 
| --- a/webrtc/modules/video_coding/generic_decoder.cc | 
| +++ b/webrtc/modules/video_coding/generic_decoder.cc | 
| @@ -74,7 +74,8 @@ int32_t VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage, | 
| _timing->StopDecodeTimer(decodedImage.timestamp(), decode_time_ms, now_ms, | 
| frameInfo->renderTimeMs); | 
|  | 
| -  decodedImage.set_render_time_ms(frameInfo->renderTimeMs); | 
| +  decodedImage.set_timestamp_us( | 
| +      frameInfo->renderTimeMs * rtc::kNumMicrosecsPerMillisec); | 
| decodedImage.set_rotation(frameInfo->rotation); | 
| // TODO(sakal): Investigate why callback is NULL sometimes and replace if | 
| // statement with a DCHECK. | 
|  |