Commit 4154163e authored by fbarchard@google.com's avatar fbarchard@google.com

make the lib self contained .a files

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@682 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 95c29d53
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 681
Version: 682
License: BSD
License File: LICENSE
......
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 681
#define LIBYUV_VERSION 682
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
......@@ -15,6 +15,8 @@
'target_name': 'libyuv',
# Change type to 'shared_library' to build .so or .dll files.
'type': 'static_library',
# Allows libyuv.a redistributable library without external dependencies.
'standalone_static_library': 1,
'conditions': [
# TODO(fbarchard): Use gyp define to enable jpeg.
[ 'OS != "ios"', {
......
......@@ -1059,7 +1059,6 @@ static void ScaleARGBAnySize(int src_width, int src_height,
}
// ScaleARGB a ARGB.
//
// This function in turn calls a scaling function
// suitable for handling the desired resolutions.
......@@ -1070,7 +1069,7 @@ static void ScaleARGB(const uint8* src, int src_stride,
FilterMode filtering) {
#ifdef CPU_X86
// environment variable overrides for testing.
char *filter_override = getenv("LIBYUV_FILTER");
char* filter_override = getenv("LIBYUV_FILTER");
if (filter_override) {
filtering = (FilterMode)atoi(filter_override); // NOLINT
}
......
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