diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2023-06-12 23:55:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-12 23:55:07 +0000 |
| commit | 1f9deebc6ecf78b637dff50d62772b48332ea5ea (patch) | |
| tree | 303e8eabb435a80ebec36a19c23ca85744d58fb5 /files/source/mjpeg_decoder.cc | |
| parent | 435db9f11b09187e0d60683813a28d07cc13166b (diff) | |
| parent | 8e521e2ea589b4cafb788330f83037a0413f200a (diff) | |
| download | libyuv-1f9deebc6ecf78b637dff50d62772b48332ea5ea.tar.gz | |
Merge "libyuv: Update to r1871 (2a6cb743)" am: 8e521e2ea5
Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/2622518
Change-Id: I677290d9641c9a7a343f79cf385e88af70ec589d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'files/source/mjpeg_decoder.cc')
| -rw-r--r-- | files/source/mjpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/files/source/mjpeg_decoder.cc b/files/source/mjpeg_decoder.cc index 4ccf00a3..0141da8a 100644 --- a/files/source/mjpeg_decoder.cc +++ b/files/source/mjpeg_decoder.cc @@ -109,7 +109,7 @@ LIBYUV_BOOL MJpegDecoder::LoadFrame(const uint8_t* src, size_t src_len) { } buf_.data = src; - buf_.len = static_cast<int>(src_len); + buf_.len = (int)src_len; buf_vec_.pos = 0; decompress_struct_->client_data = &buf_vec_; #ifdef HAVE_SETJMP @@ -428,7 +428,7 @@ boolean fill_input_buffer(j_decompress_ptr cinfo) { void skip_input_data(j_decompress_ptr cinfo, long num_bytes) { // NOLINT jpeg_source_mgr* src = cinfo->src; - size_t bytes = static_cast<size_t>(num_bytes); + size_t bytes = (size_t)num_bytes; if (bytes > src->bytes_in_buffer) { src->next_input_byte = nullptr; src->bytes_in_buffer = 0; |