Commit 9a46283c authored by fbarchard@google.com's avatar fbarchard@google.com

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
parent fa831883
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 974
Version: 975
License: BSD
License File: LICENSE
......
......@@ -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
......@@ -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',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment