diff options
| author | Colin Cross <ccross@android.com> | 2017-04-26 11:18:36 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-05-03 21:43:02 +0000 |
| commit | 504f9daf35a3f637676547a41a45b0380f9d1907 (patch) | |
| tree | b1bc3cd7c7d5248d4d16ce4a44042ef18a899b10 | |
| parent | d24d7e44adb0aa11fedf2beeb0f50b704ba33c84 (diff) | |
| download | libvpx-504f9daf35a3f637676547a41a45b0380f9d1907.tar.gz | |
Rerun generate-config.sh
Test: none
Change-Id: I4a0940c8a598afecd9911d36b701ded9e0049105
Merged-In: I4a0940c8a598afecd9911d36b701ded9e0049105
(cherry picked from commit e66892f4684d58730772e1f17b049eedd179dd89)
| -rw-r--r-- | config/mips32-msa/vpx_config.c | 2 | ||||
| -rw-r--r-- | config/mips32-msa/vpx_config.h | 4 | ||||
| -rw-r--r-- | config/mips64-msa/vpx_config.c | 2 | ||||
| -rw-r--r-- | config/mips64-msa/vpx_config.h | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/config/mips32-msa/vpx_config.c b/config/mips32-msa/vpx_config.c index 51a7c060f..21f7c3b82 100644 --- a/config/mips32-msa/vpx_config.c +++ b/config/mips32-msa/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=mips32-linux-gcc --enable-msa --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=mips32-linux-gcc --enable-msa --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/mips32-msa/vpx_config.h b/config/mips32-msa/vpx_config.h index ab7467d3d..e48caa9b8 100644 --- a/config/mips32-msa/vpx_config.h +++ b/config/mips32-msa/vpx_config.h @@ -84,9 +84,11 @@ #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_BETTER_HW_COMPATIBILITY 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ diff --git a/config/mips64-msa/vpx_config.c b/config/mips64-msa/vpx_config.c index e0cc82a84..c1ab4fb90 100644 --- a/config/mips64-msa/vpx_config.c +++ b/config/mips64-msa/vpx_config.c @@ -6,5 +6,5 @@ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ #include "vpx/vpx_codec.h" -static const char* const cfg = "--target=mips64-linux-gcc --enable-msa --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect"; +static const char* const cfg = "--target=mips64-linux-gcc --enable-msa --enable-external-build --enable-realtime-only --enable-pic --disable-runtime-cpu-detect --disable-install-docs --size-limit=4096x3072"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/config/mips64-msa/vpx_config.h b/config/mips64-msa/vpx_config.h index 15146efef..8fb117b69 100644 --- a/config/mips64-msa/vpx_config.h +++ b/config/mips64-msa/vpx_config.h @@ -84,9 +84,11 @@ #define CONFIG_VP9_HIGHBITDEPTH 0 #define CONFIG_BETTER_HW_COMPATIBILITY 0 #define CONFIG_EXPERIMENTAL 0 -#define CONFIG_SIZE_LIMIT 0 +#define CONFIG_SIZE_LIMIT 1 #define CONFIG_SPATIAL_SVC 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_EMULATE_HARDWARE 0 #define CONFIG_MISC_FIXES 0 +#define DECODE_WIDTH_LIMIT 4096 +#define DECODE_HEIGHT_LIMIT 3072 #endif /* VPX_CONFIG_H */ |