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/parsers | |
| 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/parsers')
| -rw-r--r-- | chromium/media/parsers/vp8_bool_decoder.cc | 11 | ||||
| -rw-r--r-- | chromium/media/parsers/vp8_bool_decoder.h | 1 | ||||
| -rw-r--r-- | chromium/media/parsers/vp8_parser.cc | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/chromium/media/parsers/vp8_bool_decoder.cc b/chromium/media/parsers/vp8_bool_decoder.cc index 17607732f69..fb715e5ea29 100644 --- a/chromium/media/parsers/vp8_bool_decoder.cc +++ b/chromium/media/parsers/vp8_bool_decoder.cc @@ -82,15 +82,14 @@ static const unsigned char kVp8Norm[256] = { }; Vp8BoolDecoder::Vp8BoolDecoder() - : user_buffer_(NULL), - user_buffer_end_(NULL), + : user_buffer_(nullptr), + user_buffer_end_(nullptr), value_(0), count_(-8), - range_(255) { -} + range_(255) {} bool Vp8BoolDecoder::Initialize(const uint8_t* data, size_t size) { - if (data == NULL || size == 0) + if (data == nullptr || size == 0) return false; user_buffer_start_ = data; user_buffer_ = data; @@ -102,7 +101,7 @@ bool Vp8BoolDecoder::Initialize(const uint8_t* data, size_t size) { } void Vp8BoolDecoder::FillDecoder() { - DCHECK(user_buffer_ != NULL); + DCHECK(user_buffer_ != nullptr); int shift = VP8_BD_VALUE_BIT - CHAR_BIT - (count_ + CHAR_BIT); size_t bytes_left = user_buffer_end_ - user_buffer_; size_t bits_left = bytes_left * CHAR_BIT; diff --git a/chromium/media/parsers/vp8_bool_decoder.h b/chromium/media/parsers/vp8_bool_decoder.h index 0f407cfbcc9..db3daade283 100644 --- a/chromium/media/parsers/vp8_bool_decoder.h +++ b/chromium/media/parsers/vp8_bool_decoder.h @@ -47,7 +47,6 @@ #include <stdint.h> #include <sys/types.h> -#include "base/logging.h" #include "base/macros.h" #include "media/parsers/media_parsers_export.h" diff --git a/chromium/media/parsers/vp8_parser.cc b/chromium/media/parsers/vp8_parser.cc index b52c59fd070..8559540395c 100644 --- a/chromium/media/parsers/vp8_parser.cc +++ b/chromium/media/parsers/vp8_parser.cc @@ -9,6 +9,7 @@ #include <cstring> +#include "base/check_op.h" #include "base/logging.h" namespace media { |