| Index: webrtc/modules/video_coding/main/source/codec_database.cc
 | 
| diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc
 | 
| index 349791d83b826187c5c21ecfbe53218a92a04d9b..87f5c5263e3e1f73345142c6c374c8cdf60c34ee 100644
 | 
| --- a/webrtc/modules/video_coding/main/source/codec_database.cc
 | 
| +++ b/webrtc/modules/video_coding/main/source/codec_database.cc
 | 
| @@ -93,11 +93,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(
 | 
| @@ -488,11 +486,10 @@ bool VCMCodecDataBase::DeregisterExternalDecoder(uint8_t payload_type) {
 | 
|  // Won't be registered as a receive codec until RegisterReceiveCodec is called.
 | 
|  bool 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);
 | 
|    if (!ext_decoder) {
 | 
|      return false;
 | 
|    }
 | 
| @@ -594,12 +591,10 @@ void VCMCodecDataBase::ReleaseDecoder(VCMGenericDecoder* decoder) const {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| -bool VCMCodecDataBase::SupportsRenderScheduling() const {
 | 
| -  const VCMExtDecoderMapItem* ext_item = FindExternalDecoderItem(
 | 
| -      receive_codec_.plType);
 | 
| -  if (ext_item == nullptr)
 | 
| -    return true;
 | 
| -  return ext_item->internal_render_timing;
 | 
| +bool VCMCodecDataBase::HasOnlyOneOutputBuffer() const {
 | 
| +  if (!ptr_decoder_)
 | 
| +    return false;
 | 
| +  return ptr_decoder_->HasOnlyOneOutputBuffer();
 | 
|  }
 | 
|  
 | 
|  bool VCMCodecDataBase::MatchesCurrentResolution(int width, int height) const {
 | 
| 
 |