Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: source/config/linux/generic/vpx_config.asm

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/config/linux/generic/vpx_config.h ('k') | source/config/linux/generic/vpx_dsp_rtcd.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/config/linux/generic/vpx_config.asm
diff --git a/source/config/linux/generic/vpx_config.asm b/source/config/linux/generic/vpx_config.asm
index a2a18fdc7fd12ceb0cbe4d6c05fbb37803b9887a..fe14db86b58198271b11f99a35c631c94dd38437 100644
--- a/source/config/linux/generic/vpx_config.asm
+++ b/source/config/linux/generic/vpx_config.asm
@@ -54,8 +54,11 @@
.equ CONFIG_VP8_DECODER , 1
.equ CONFIG_VP9_ENCODER , 1
.equ CONFIG_VP9_DECODER , 1
+.equ CONFIG_VP10_ENCODER , 0
+.equ CONFIG_VP10_DECODER , 0
.equ CONFIG_VP8 , 1
.equ CONFIG_VP9 , 1
+.equ CONFIG_VP10 , 0
.equ CONFIG_ENCODERS , 1
.equ CONFIG_DECODERS , 1
.equ CONFIG_STATIC_MSVCRT , 0
« no previous file with comments | « source/config/linux/generic/vpx_config.h ('k') | source/config/linux/generic/vpx_dsp_rtcd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698