diff --git a/README.chromium b/README.chromium index 0d8f4be4a..75c657200 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 181 +Version: 182 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 0bc03638c..31bd8bf82 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,7 +11,7 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 181 +#define LIBYUV_VERSION 182 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/source/convert.cc b/source/convert.cc index c933d533a..5851bdc96 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -1855,6 +1855,7 @@ int ConvertToI420(const uint8* sample, size_t sample_size, dst_width, inv_dst_height); break; } +#ifdef HAVE_JPEG case FOURCC_MJPG: r = MJPGToI420(sample, sample_size, y, y_stride, @@ -1862,6 +1863,7 @@ int ConvertToI420(const uint8* sample, size_t sample_size, v, v_stride, src_width, abs_src_height, dst_width, inv_dst_height); break; +#endif default: return -1; // unknown fourcc - return failure code. }