| Index: media/filters/ffmpeg_demuxer.cc
|
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
|
| index 508dd095407f27020fe3558156e48890391d5661..6fd8fc85d5b024ad27a0c2a01a2551d9ada4f4f6 100644
|
| --- a/media/filters/ffmpeg_demuxer.cc
|
| +++ b/media/filters/ffmpeg_demuxer.cc
|
| @@ -137,20 +137,20 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
|
| encryption_key_id_.size()));
|
| if (!config)
|
| LOG(ERROR) << "Creation of DecryptConfig failed.";
|
| - buffer->SetDecryptConfig(config.Pass());
|
| + buffer->set_decrypt_config(config.Pass());
|
| }
|
|
|
| - buffer->SetTimestamp(ConvertStreamTimestamp(
|
| + buffer->set_timestamp(ConvertStreamTimestamp(
|
| stream_->time_base, packet->pts));
|
| - buffer->SetDuration(ConvertStreamTimestamp(
|
| + buffer->set_duration(ConvertStreamTimestamp(
|
| stream_->time_base, packet->duration));
|
| - if (buffer->GetTimestamp() != kNoTimestamp() &&
|
| + if (buffer->timestamp() != kNoTimestamp() &&
|
| last_packet_timestamp_ != kNoTimestamp() &&
|
| - last_packet_timestamp_ < buffer->GetTimestamp()) {
|
| - buffered_ranges_.Add(last_packet_timestamp_, buffer->GetTimestamp());
|
| + last_packet_timestamp_ < buffer->timestamp()) {
|
| + buffered_ranges_.Add(last_packet_timestamp_, buffer->timestamp());
|
| demuxer_->NotifyBufferingChanged();
|
| }
|
| - last_packet_timestamp_ = buffer->GetTimestamp();
|
| + last_packet_timestamp_ = buffer->timestamp();
|
|
|
| buffer_queue_.Push(buffer);
|
| SatisfyPendingRead();
|
|
|