Commit 41ac71d2 authored by fbarchard@google.com's avatar fbarchard@google.com

remove jpeg from includes since dependency does that

BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/405002

git-svn-id: http://libyuv.googlecode.com/svn/trunk@188 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 4339f09d
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 186
Version: 188
License: BSD
License File: LICENSE
......
......@@ -11,7 +11,7 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 186
#define LIBYUV_VERSION 188
#endif // INCLUDE_LIBYUV_VERSION_H_
......@@ -12,7 +12,7 @@
'target_name': 'libyuv',
'type': 'static_library',
'dependencies': [
'third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
'<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
'defines': [
'HAVE_JPEG',
......@@ -20,7 +20,6 @@
'include_dirs': [
'include',
'.',
'third_party/libjpeg_turbo',
],
'direct_dependent_settings': {
'include_dirs': [
......@@ -33,10 +32,10 @@
'include/libyuv/basic_types.h',
'include/libyuv/convert.h',
'include/libyuv/convert_from.h',
'include/libyuv/scale.h',
'include/libyuv/planar_functions.h',
'include/libyuv/video_common.h',
'include/libyuv/scale.h',
'include/libyuv/version.h',
'include/libyuv/video_common.h',
# headers
'source/rotate_priv.h',
......@@ -48,13 +47,13 @@
'source/convert_from.cc',
'source/cpu_id.cc',
'source/format_conversion.cc',
'source/planar_functions.cc',
'source/mjpeg_decoder.cc',
'source/planar_functions.cc',
'source/rotate.cc',
'source/rotate_neon.cc',
'source/row_common.cc',
'source/row_posix.cc',
'source/row_neon.cc',
'source/row_posix.cc',
'source/row_win.cc',
'source/scale.cc',
'source/video_common.cc',
......
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