diff options
Diffstat (limited to 'media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc')
| -rw-r--r-- | media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc index 355d4e22b3..6436817c9b 100644 --- a/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc +++ b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc @@ -136,9 +136,8 @@ uint64 WriteBlock(IMkvWriter* writer, const Frame* const frame, int64 timecode, return false; } - if (!frame->is_key() && - !WriteEbmlElement(writer, libwebm::kMkvReferenceBlock, - reference_block_timestamp)) { + if (!frame->is_key() && !WriteEbmlElement(writer, libwebm::kMkvReferenceBlock, + reference_block_timestamp)) { return false; } @@ -509,7 +508,7 @@ bool WriteEbmlElement(IMkvWriter* writer, uint64 type, const char* value) { if (WriteUInt(writer, length)) return false; - if (writer->Write(value, static_cast<const uint32>(length))) + if (writer->Write(value, static_cast<uint32>(length))) return false; return true; @@ -563,10 +562,10 @@ uint64 WriteFrame(IMkvWriter* writer, const Frame* const frame, if (relative_timecode < 0 || relative_timecode > kMaxBlockTimecode) return 0; - return frame->CanBeSimpleBlock() ? - WriteSimpleBlock(writer, frame, relative_timecode) : - WriteBlock(writer, frame, relative_timecode, - cluster->timecode_scale()); + return frame->CanBeSimpleBlock() + ? WriteSimpleBlock(writer, frame, relative_timecode) + : WriteBlock(writer, frame, relative_timecode, + cluster->timecode_scale()); } uint64 WriteVoidElement(IMkvWriter* writer, uint64 size) { |