| Index: webrtc/modules/video_coding/codec_database.cc
 | 
| diff --git a/webrtc/modules/video_coding/codec_database.cc b/webrtc/modules/video_coding/codec_database.cc
 | 
| index be7f5ca376d039f4acac89d31579304bfd8e8e28..cb2456ad53371be7967a490e60f36efe87cefaee 100644
 | 
| --- a/webrtc/modules/video_coding/codec_database.cc
 | 
| +++ b/webrtc/modules/video_coding/codec_database.cc
 | 
| @@ -85,11 +85,9 @@ VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings,
 | 
|  
 | 
|  VCMExtDecoderMapItem::VCMExtDecoderMapItem(
 | 
|      VideoDecoder* external_decoder_instance,
 | 
| -    uint8_t payload_type,
 | 
| -    bool internal_render_timing)
 | 
| +    uint8_t payload_type)
 | 
|      : payload_type(payload_type),
 | 
| -      external_decoder_instance(external_decoder_instance),
 | 
| -      internal_render_timing(internal_render_timing) {
 | 
| +      external_decoder_instance(external_decoder_instance) {
 | 
|  }
 | 
|  
 | 
|  VCMCodecDataBase::VCMCodecDataBase(
 | 
| @@ -421,11 +419,10 @@ bool VCMCodecDataBase::DeregisterExternalDecoder(uint8_t payload_type) {
 | 
|  // Won't be registered as a receive codec until RegisterReceiveCodec is called.
 | 
|  void VCMCodecDataBase::RegisterExternalDecoder(
 | 
|      VideoDecoder* external_decoder,
 | 
| -    uint8_t payload_type,
 | 
| -    bool internal_render_timing) {
 | 
| +    uint8_t payload_type) {
 | 
|    // Check if payload value already exists, if so  - erase old and insert new.
 | 
|    VCMExtDecoderMapItem* ext_decoder = new VCMExtDecoderMapItem(
 | 
| -      external_decoder, payload_type, internal_render_timing);
 | 
| +      external_decoder, payload_type);
 | 
|    DeregisterExternalDecoder(payload_type);
 | 
|    dec_external_map_[payload_type] = ext_decoder;
 | 
|  }
 | 
| @@ -524,12 +521,10 @@ void VCMCodecDataBase::ReleaseDecoder(VCMGenericDecoder* decoder) const {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| -bool VCMCodecDataBase::SupportsRenderScheduling() const {
 | 
| -  const VCMExtDecoderMapItem* ext_item = FindExternalDecoderItem(
 | 
| -      receive_codec_.plType);
 | 
| -  if (!ext_item)
 | 
| -    return true;
 | 
| -  return ext_item->internal_render_timing;
 | 
| +bool VCMCodecDataBase::PreferDecodeLate() const {
 | 
| +  if (!ptr_decoder_)
 | 
| +    return false;
 | 
| +  return ptr_decoder_->PreferDecodeLate();
 | 
|  }
 | 
|  
 | 
|  bool VCMCodecDataBase::MatchesCurrentResolution(int width, int height) const {
 | 
| 
 |