coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow system jpeg to be used instead of libjpeg_turbo.

Browse Source 
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
This commit is contained in:
fbarchard@google.com 2014-01-18 02:07:16 +00:00
parent fa83188365
commit 9a46283c6d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 974 Version: 975
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 974 #define LIBYUV_VERSION 975
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

4
libyuv.gyp
View File

@ -72,8 +72,8 @@
'HAVE_JPEG' 'HAVE_JPEG'
], ],
'conditions': [ 'conditions': [
# Android uses libjpeg for system jpeg support. # Caveat system jpeg support may not support motion jpeg
[ 'OS == "android" and use_system_libjpeg == 1', { [ 'use_system_libjpeg == 1', {
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg', '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
], ],