From 9a46283c6d1ffa2cc932bae5cfdbb6def8ed1544 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Sat, 18 Jan 2014 02:07:16 +0000 Subject: [PATCH] Allow system jpeg to be used instead of libjpeg_turbo. BUG=56 TESTED=untested R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/7339004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@975 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv.gyp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index bd7c691d6..901a9439f 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 974 +Version: 975 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 7e57c58b3..99fcaee3e 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 974 +#define LIBYUV_VERSION 975 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index 75851ea16..9f3f3f838 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -72,8 +72,8 @@ 'HAVE_JPEG' ], 'conditions': [ - # Android uses libjpeg for system jpeg support. - [ 'OS == "android" and use_system_libjpeg == 1', { + # Caveat system jpeg support may not support motion jpeg + [ 'use_system_libjpeg == 1', { 'dependencies': [ '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg', ],