diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-01 11:36:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-01 11:36:11 +0000 |
commit | af9f1a921da189437cc66ce958ff8392e72afa03 (patch) | |
tree | e8cf5f7cdc94a5abfe84a758a4245d7269b65f8f /files/source/mjpeg_decoder.cc | |
parent | 8b05ee40e72d2042d2f05fd9beb23e15fe17f674 (diff) | |
parent | ae40525c466f4ffc607a4fd0befdd86fca592e6c (diff) | |
download | libyuv-af9f1a921da189437cc66ce958ff8392e72afa03.tar.gz |
Merge "Snap for 9550355 from 435db9f11b09187e0d60683813a28d07cc13166b to sdk-release" into sdk-releaseplatform-tools-34.0.3platform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4
Diffstat (limited to 'files/source/mjpeg_decoder.cc')
-rw-r--r-- | files/source/mjpeg_decoder.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/files/source/mjpeg_decoder.cc b/files/source/mjpeg_decoder.cc index 5c5e5ead..4ccf00a3 100644 --- a/files/source/mjpeg_decoder.cc +++ b/files/source/mjpeg_decoder.cc @@ -417,7 +417,6 @@ void init_source(j_decompress_ptr cinfo) { boolean fill_input_buffer(j_decompress_ptr cinfo) { BufferVector* buf_vec = reinterpret_cast<BufferVector*>(cinfo->client_data); if (buf_vec->pos >= buf_vec->len) { - assert(0 && "No more data"); // ERROR: No more data return FALSE; } @@ -430,7 +429,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); - if(bytes > src->bytes_in_buffer) { + if (bytes > src->bytes_in_buffer) { src->next_input_byte = nullptr; src->bytes_in_buffer = 0; } else { |