Index: webrtc/modules/video_coding/session_info.cc |
diff --git a/webrtc/modules/video_coding/session_info.cc b/webrtc/modules/video_coding/session_info.cc |
index bb2b983b20bab289833f1629efa9a75e901f38ae..d3f315170b2f27bcd05d03a344217bac5ba1eb83 100644 |
--- a/webrtc/modules/video_coding/session_info.cc |
+++ b/webrtc/modules/video_coding/session_info.cc |
@@ -37,8 +37,8 @@ VCMSessionInfo::VCMSessionInfo() |
void VCMSessionInfo::UpdateDataPointers(const uint8_t* old_base_ptr, |
const uint8_t* new_base_ptr) { |
for (PacketIterator it = packets_.begin(); it != packets_.end(); ++it) |
- if ((*it).dataPtr != NULL) { |
- assert(old_base_ptr != NULL && new_base_ptr != NULL); |
+ if ((*it).dataPtr != nullptr) { |
+ assert(old_base_ptr != nullptr && new_base_ptr != nullptr); |
(*it).dataPtr = new_base_ptr + ((*it).dataPtr - old_base_ptr); |
} |
} |
@@ -243,7 +243,7 @@ void VCMSessionInfo::ShiftSubsequentPackets(PacketIterator it, |
// Calculate the total move length and move the data pointers in advance. |
for (; it != packets_.end(); ++it) { |
shift_length += (*it).sizeBytes; |
- if ((*it).dataPtr != NULL) |
+ if ((*it).dataPtr != nullptr) |
(*it).dataPtr += steps_to_shift; |
} |
memmove(first_packet_ptr + steps_to_shift, first_packet_ptr, shift_length); |
@@ -332,7 +332,7 @@ size_t VCMSessionInfo::DeletePacketData(PacketIterator start, |
for (PacketIterator it = start; it != packet_after_end; ++it) { |
bytes_to_delete += (*it).sizeBytes; |
(*it).sizeBytes = 0; |
- (*it).dataPtr = NULL; |
+ (*it).dataPtr = nullptr; |
} |
if (bytes_to_delete > 0) |
ShiftSubsequentPackets(end, -static_cast<int>(bytes_to_delete)); |