diff --git a/third_party/libvpx/generate_gypi.sh b/third_party/libvpx/generate_gypi.sh index 0ddc8b2a9..6968899fa 100755 --- a/third_party/libvpx/generate_gypi.sh +++ b/third_party/libvpx/generate_gypi.sh @@ -21,7 +21,7 @@ # http://src.chromium.org/svn/trunk/deps/third_party/libvpx/generate_gypi.sh LIBVPX_SRC_DIR="source/libvpx" -COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_ERROR_CONCEALMENT=yes CONFIG_POSTPROC=yes CONFIG_MULTI_RES_ENCODING=yes" +COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_ERROR_CONCEALMENT=yes CONFIG_POSTPROC=yes" X86_CONFIG="ARCH_X86=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_RUNTIME_CPU_DETECT=yes" X86_64_CONFIG="ARCH_X86_64=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_PIC=yes CONFIG_RUNTIME_CPU_DETECT=yes" ARM_CONFIG="ARCH_ARM=yes HAVE_EDSP=yes HAVE_MEDIA=yes" diff --git a/third_party/libvpx/libvpx_srcs_arm.gypi b/third_party/libvpx/libvpx_srcs_arm.gypi index 505536348..44ea3ac44 100644 --- a/third_party/libvpx/libvpx_srcs_arm.gypi +++ b/third_party/libvpx/libvpx_srcs_arm.gypi @@ -147,8 +147,6 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', - 'source/libvpx/vp8/encoder/mr_dissim.c', - 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', diff --git a/third_party/libvpx/libvpx_srcs_arm_neon.gypi b/third_party/libvpx/libvpx_srcs_arm_neon.gypi index 6d0b1b3d0..21316580e 100644 --- a/third_party/libvpx/libvpx_srcs_arm_neon.gypi +++ b/third_party/libvpx/libvpx_srcs_arm_neon.gypi @@ -185,8 +185,6 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', - 'source/libvpx/vp8/encoder/mr_dissim.c', - 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi index a4dd2784e..ee8b85bbd 100644 --- a/third_party/libvpx/libvpx_srcs_x86.gypi +++ b/third_party/libvpx/libvpx_srcs_x86.gypi @@ -142,8 +142,6 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', - 'source/libvpx/vp8/encoder/mr_dissim.c', - 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', diff --git a/third_party/libvpx/libvpx_srcs_x86_64.gypi b/third_party/libvpx/libvpx_srcs_x86_64.gypi index f48e854ce..2e1f4659e 100644 --- a/third_party/libvpx/libvpx_srcs_x86_64.gypi +++ b/third_party/libvpx/libvpx_srcs_x86_64.gypi @@ -143,8 +143,6 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', - 'source/libvpx/vp8/encoder/mr_dissim.c', - 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm index 4edb7b1e1..ea83b9b4b 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm @@ -66,7 +66,7 @@ .equ CONFIG_POSTPROC_VISUALIZER , 0 .equ CONFIG_OS_SUPPORT , 1 .equ CONFIG_UNIT_TESTS , 0 -.equ CONFIG_MULTI_RES_ENCODING , 1 +.equ CONFIG_MULTI_RES_ENCODING , 0 .equ CONFIG_TEMPORAL_DENOISING , 1 .section .note.GNU-stack,"",%progbits @ This file was created from a .asm file diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c index 4bd1e9cc9..4d55550f3 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding --disable-runtime-cpu-detect"; +static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --disable-runtime-cpu-detect"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h index 531ba3a11..ebf753147 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.asm b/third_party/libvpx/source/config/linux/arm/vpx_config.asm index bc44a8ddd..3b0422544 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/arm/vpx_config.asm @@ -66,7 +66,7 @@ .equ CONFIG_POSTPROC_VISUALIZER , 0 .equ CONFIG_OS_SUPPORT , 1 .equ CONFIG_UNIT_TESTS , 0 -.equ CONFIG_MULTI_RES_ENCODING , 1 +.equ CONFIG_MULTI_RES_ENCODING , 0 .equ CONFIG_TEMPORAL_DENOISING , 1 .section .note.GNU-stack,"",%progbits @ This file was created from a .asm file diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.c b/third_party/libvpx/source/config/linux/arm/vpx_config.c index 0a566a9a9..b77a57bb0 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_config.c +++ b/third_party/libvpx/source/config/linux/arm/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding"; +static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.h b/third_party/libvpx/source/config/linux/arm/vpx_config.h index 8e697fb62..acbbcd197 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_config.h +++ b/third_party/libvpx/source/config/linux/arm/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm index 6c39f37bb..a59bf69fb 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 1 +CONFIG_MULTI_RES_ENCODING equ 0 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.c b/third_party/libvpx/source/config/linux/ia32/vpx_config.c index f843e57a2..280ac073a 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_config.c +++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; +static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.h b/third_party/libvpx/source/config/linux/ia32/vpx_config.h index f079b8d1a..c4f09fdbb 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_config.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.asm b/third_party/libvpx/source/config/linux/x64/vpx_config.asm index cb005db2e..0ca410910 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/x64/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 1 +CONFIG_MULTI_RES_ENCODING equ 0 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.c b/third_party/libvpx/source/config/linux/x64/vpx_config.c index 776c7e087..2ac65f7b8 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_config.c +++ b/third_party/libvpx/source/config/linux/x64/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; +static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.h b/third_party/libvpx/source/config/linux/x64/vpx_config.h index 001ab19a0..a031d9562 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_config.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm index 6c39f37bb..a59bf69fb 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm +++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 1 +CONFIG_MULTI_RES_ENCODING equ 0 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.c b/third_party/libvpx/source/config/mac/ia32/vpx_config.c index 775ad6795..04c00a130 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_config.c +++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; +static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.h b/third_party/libvpx/source/config/mac/ia32/vpx_config.h index f079b8d1a..c4f09fdbb 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_config.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.asm b/third_party/libvpx/source/config/mac/x64/vpx_config.asm index cb005db2e..0ca410910 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_config.asm +++ b/third_party/libvpx/source/config/mac/x64/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 1 +CONFIG_MULTI_RES_ENCODING equ 0 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.c b/third_party/libvpx/source/config/mac/x64/vpx_config.c index e764d7c2b..d6197504b 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_config.c +++ b/third_party/libvpx/source/config/mac/x64/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; +static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.h b/third_party/libvpx/source/config/mac/x64/vpx_config.h index 001ab19a0..a031d9562 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_config.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.asm b/third_party/libvpx/source/config/win/ia32/vpx_config.asm index 456e96fc5..411adcf5c 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_config.asm +++ b/third_party/libvpx/source/config/win/ia32/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 1 +CONFIG_MULTI_RES_ENCODING equ 0 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.c b/third_party/libvpx/source/config/win/ia32/vpx_config.c index 60580d73e..bcd9622de 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_config.c +++ b/third_party/libvpx/source/config/win/ia32/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding --enable-static-msvcrt --as=yasm"; +static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.h b/third_party/libvpx/source/config/win/ia32/vpx_config.h index bdfa8dac4..0f66f460f 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_config.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.asm b/third_party/libvpx/source/config/win/x64/vpx_config.asm index df6f68b23..5bb3022ff 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_config.asm +++ b/third_party/libvpx/source/config/win/x64/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 1 +CONFIG_MULTI_RES_ENCODING equ 0 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.c b/third_party/libvpx/source/config/win/x64/vpx_config.c index 372eac53c..c59d62c84 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_config.c +++ b/third_party/libvpx/source/config/win/x64/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding --enable-static-msvcrt --as=yasm"; +static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.h b/third_party/libvpx/source/config/win/x64/vpx_config.h index f8f03d816..1a61d9ade 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_config.h +++ b/third_party/libvpx/source/config/win/x64/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 1 +#define CONFIG_MULTI_RES_ENCODING 0 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */