Chromium Code Reviews| Index: media/filters/chunk_demuxer.cc |
| diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc |
| index c80ee9ea2d1e1ec8a9694bd9fc2e10a0c6920435..792ae36c3e734929752a0273565881370d57a416 100644 |
| --- a/media/filters/chunk_demuxer.cc |
| +++ b/media/filters/chunk_demuxer.cc |
| @@ -854,7 +854,7 @@ TimeDelta ChunkDemuxerStream::GetBufferedDuration() const { |
| return stream_->GetBufferedDuration(); |
| } |
| -void ChunkDemuxerStream::OnNewMediaSegment(TimeDelta start_timestamp) { |
| +void ChunkDemuxerStream::OnNewMediaSegment(DecodeTimestamp start_timestamp) { |
| DVLOG(2) << "ChunkDemuxerStream::OnNewMediaSegment(" |
| << start_timestamp.InSecondsF() << ")"; |
| base::AutoLock auto_lock(lock_); |
| @@ -1147,7 +1147,6 @@ void ChunkDemuxer::CancelPendingSeek(TimeDelta seek_time) { |
| cancel_next_seek_ = true; |
| return; |
| } |
| - |
|
wolenetz
2014/08/08 21:30:04
nit: I like blank line after } in this case, and d
acolwell GONE FROM CHROMIUM
2014/08/11 17:05:05
Done.
|
| base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK); |
| } |