From 5625adfa12500684bbef0525c7c4d6aa0eaaf3c6 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 18 Sep 2012 21:31:21 +0000 Subject: [PATCH] Respect HAVE_JPEG and build cleanly BUG=93 TEST=none Review URL: https://webrtc-codereview.appspot.com/812004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@361 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/convert.cc | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 71583cc4d..3ca3b9e57 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 360 +Version: 361 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f1e328280..67d011384 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 360 +#define LIBYUV_VERSION 361 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/convert.cc b/source/convert.cc index a13e11f5d..b23afdade 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -1697,7 +1697,12 @@ int MJPGToI420(const uint8* sample, // src_height is used to compute location of planes, and indicate inversion // sample_size is measured in bytes and is the size of the frame. // With MJPEG it is the compressed size of the frame. -int ConvertToI420(const uint8* sample, size_t sample_size, +int ConvertToI420(const uint8* sample, +#ifdef HAVE_JPEG + size_t sample_size, +#else + size_t /* sample_size */, +#endif uint8* y, int y_stride, uint8* u, int u_stride, uint8* v, int v_stride,