diff --git a/README.chromium b/README.chromium index ecca83d1d..4184b932b 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 656 +Version: 657 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f5163d5ed..597c56930 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 656 +#define LIBYUV_VERSION 657 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc index 197377760..5d7296d7e 100644 --- a/source/mjpeg_decoder.cc +++ b/source/mjpeg_decoder.cc @@ -75,30 +75,6 @@ MJpegDecoder::~MJpegDecoder() { DestroyOutputBuffers(); } -// Helper function to validate the jpeg looks ok. -// TODO(fbarchard): Optimize case where SOI is found but EOI is not. -bool ValidateJpeg(const uint8* sample, size_t sample_size) { - if (sample_size < 64) { - // ERROR: Invalid jpeg size: sample_size - return false; - } - if (sample[0] != 0xff || sample[1] != 0xd8) { // Start Of Image - // ERROR: Invalid jpeg initial start code - return false; - } - for (int i = static_cast(sample_size) - 2; i > 1;) { - if (sample[i] != 0xd9) { - if (sample[i] == 0xff && sample[i + 1] == 0xd9) { // End Of Image - return true; - } - --i; - } - --i; - } - // ERROR: Invalid jpeg end code not found. Size sample_size - return false; -} - bool MJpegDecoder::LoadFrame(const uint8* src, size_t src_len) { if (!ValidateJpeg(src, src_len)) { return false;