diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/blink/websourcebuffer_impl.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/blink/websourcebuffer_impl.cc')
| -rw-r--r-- | chromium/media/blink/websourcebuffer_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/media/blink/websourcebuffer_impl.cc b/chromium/media/blink/websourcebuffer_impl.cc index 20d841bb4fb..257df4b49ef 100644 --- a/chromium/media/blink/websourcebuffer_impl.cc +++ b/chromium/media/blink/websourcebuffer_impl.cc @@ -66,7 +66,7 @@ WebSourceBufferImpl::WebSourceBufferImpl(const std::string& id, ChunkDemuxer* demuxer) : id_(id), demuxer_(demuxer), - client_(NULL), + client_(nullptr), append_window_end_(kInfiniteDuration) { DCHECK(demuxer_); demuxer_->SetTracksWatcher( @@ -136,7 +136,7 @@ bool WebSourceBufferImpl::Append(const unsigned char* data, append_window_end_, ×tamp_offset_); // Coded frame processing may update the timestamp offset. If the caller - // provides a non-NULL |timestamp_offset| and frame processing changes the + // provides a non-nullptr |timestamp_offset| and frame processing changes the // timestamp offset, report the new offset to the caller. Do not update the // caller's offset otherwise, to preserve any pre-existing value that may have // more than microsecond precision. @@ -200,8 +200,8 @@ void WebSourceBufferImpl::SetAppendWindowEnd(double end) { void WebSourceBufferImpl::RemovedFromMediaSource() { demuxer_->RemoveId(id_); - demuxer_ = NULL; - client_ = NULL; + demuxer_ = nullptr; + client_ = nullptr; } blink::WebMediaPlayer::TrackType mediaTrackTypeToBlink(MediaTrack::Type type) { |