Index: webrtc/modules/video_coding/receiver.cc |
diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc |
index beb24ca643e1158dfe7a9f2f8ba60464c181b331..90bd994b246e311a2b42ef4af1bb464c2f79a480 100644 |
--- a/webrtc/modules/video_coding/receiver.cc |
+++ b/webrtc/modules/video_coding/receiver.cc |
@@ -183,7 +183,7 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(uint16_t max_wait_time_ms, |
// Timing error => reset timing and flush the jitter buffer. |
jitter_buffer_.Flush(); |
timing_->Reset(); |
- return NULL; |
+ return nullptr; |
} |
if (prefer_late_decoding) { |
@@ -198,9 +198,9 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(uint16_t max_wait_time_ms, |
if (new_max_wait_time < wait_time_ms) { |
// We're not allowed to wait until the frame is supposed to be rendered, |
// waiting as long as we're allowed to avoid busy looping, and then return |
- // NULL. Next call to this function might return the frame. |
+ // null. Next call to this function might return the frame. |
render_wait_event_->Wait(new_max_wait_time); |
- return NULL; |
+ return nullptr; |
} |
// Wait until it's time to render. |
render_wait_event_->Wait(wait_time_ms); |
@@ -208,8 +208,8 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(uint16_t max_wait_time_ms, |
// Extract the frame from the jitter buffer and set the render time. |
VCMEncodedFrame* frame = jitter_buffer_.ExtractAndSetDecode(frame_timestamp); |
- if (frame == NULL) { |
- return NULL; |
+ if (frame == nullptr) { |
+ return nullptr; |
} |
frame->SetRenderTime(render_time_ms); |
TRACE_EVENT_ASYNC_STEP1("webrtc", "Video", frame->TimeStamp(), "SetRenderTS", |