11 files changed, 11 insertions, 36 deletions
diff --git a/README.chromium b/README.chromium
index c26a937..7139d2d 100644
--- a/README.chromium
+++ b/README.chromium
@@ -5,9 +5,9 @@ License: BSD
 License File: source/libvpx/LICENSE
 Security Critical: yes
 
-Date: Thursday April 25 2013
+Date: Friday April 26 2013
 Branch: master
-Commit: c5b127afea85176e4b43c525eac238924e4d2116
+Commit: 9981006da04e320a677d549f4d3d48fc32121a69
 
 Description:
 Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/libvpx_srcs_x86.gypi b/libvpx_srcs_x86.gypi
index 7686cfe..f2b05ed 100644
--- a/libvpx_srcs_x86.gypi
+++ b/libvpx_srcs_x86.gypi
@@ -264,7 +264,6 @@
     '<(libvpx_source)/vp9/decoder/vp9_onyxd_if.c',
     '<(libvpx_source)/vp9/decoder/vp9_onyxd_int.h',
     '<(libvpx_source)/vp9/decoder/vp9_treereader.h',
-    '<(libvpx_source)/vp9/decoder/x86/vp9_dequantize_x86.c',
     '<(libvpx_source)/vp9/vp9_dx_iface.c',
     '<(libvpx_source)/vp9/vp9_iface_common.h',
     '<(libvpx_source)/vpx/internal/vpx_codec_internal.h',
diff --git a/libvpx_srcs_x86_64.gypi b/libvpx_srcs_x86_64.gypi
index dbc8fb2..5cd439f 100644
--- a/libvpx_srcs_x86_64.gypi
+++ b/libvpx_srcs_x86_64.gypi
@@ -266,7 +266,6 @@
     '<(libvpx_source)/vp9/decoder/vp9_onyxd_if.c',
     '<(libvpx_source)/vp9/decoder/vp9_onyxd_int.h',
     '<(libvpx_source)/vp9/decoder/vp9_treereader.h',
-    '<(libvpx_source)/vp9/decoder/x86/vp9_dequantize_x86.c',
     '<(libvpx_source)/vp9/vp9_dx_iface.c',
     '<(libvpx_source)/vp9/vp9_iface_common.h',
     '<(libvpx_source)/vpx/internal/vpx_codec_internal.h',
diff --git a/libvpx_srcs_x86_64_intrinsics.gypi b/libvpx_srcs_x86_64_intrinsics.gypi
index fe65bf8..1234449 100644
--- a/libvpx_srcs_x86_64_intrinsics.gypi
+++ b/libvpx_srcs_x86_64_intrinsics.gypi
@@ -48,6 +48,7 @@
         '<(libvpx_source)/vp9/common/x86/vp9_recon_wrapper_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_sadmxn_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_subpixel_variance_sse2.c',
+        '<(libvpx_source)/vp9/decoder/x86/vp9_dequantize_sse2.c',
         '<(libvpx_source)/vp9/decoder/x86/vp9_idct_blk_sse2.c',
       ],
       'conditions': [
diff --git a/libvpx_srcs_x86_intrinsics.gypi b/libvpx_srcs_x86_intrinsics.gypi
index fe65bf8..1234449 100644
--- a/libvpx_srcs_x86_intrinsics.gypi
+++ b/libvpx_srcs_x86_intrinsics.gypi
@@ -48,6 +48,7 @@
         '<(libvpx_source)/vp9/common/x86/vp9_recon_wrapper_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_sadmxn_sse2.c',
         '<(libvpx_source)/vp9/common/x86/vp9_subpixel_variance_sse2.c',
+        '<(libvpx_source)/vp9/decoder/x86/vp9_dequantize_sse2.c',
         '<(libvpx_source)/vp9/decoder/x86/vp9_idct_blk_sse2.c',
       ],
       'conditions': [
diff --git a/source/libvpx/build/make/configure.sh b/source/libvpx/build/make/configure.sh
index 4d0cad2..23dc87f 100755
--- a/source/libvpx/build/make/configure.sh
+++ b/source/libvpx/build/make/configure.sh
@@ -918,7 +918,7 @@ process_common_toolchain() {
             add_ldflags -arch_only ${tgt_isa}
 
             if [ -z "${alt_libc}" ]; then
-                alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk
+                alt_libc=${SDK_PATH}/SDKs/iPhoneOS6.0.sdk
             fi
 
             add_cflags  "-isysroot ${alt_libc}"
diff --git a/source/libvpx/vp9/decoder/x86/vp9_dequantize_x86.c b/source/libvpx/vp9/decoder/x86/vp9_dequantize_sse2.c
index acfae2a..1dfb8e0 100644
--- a/source/libvpx/vp9/decoder/x86/vp9_dequantize_x86.c
+++ b/source/libvpx/vp9/decoder/x86/vp9_dequantize_sse2.c
@@ -15,8 +15,6 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_idct.h"
 
-#if HAVE_SSE2
-
 void vp9_add_residual_4x4_sse2(const int16_t *diff, const uint8_t *pred,
                                int pitch, uint8_t *dest, int stride) {
   const int width = 4;
@@ -452,4 +450,3 @@ void vp9_add_constant_residual_32x32_sse2(const int16_t diff,
     dest += 4 * stride;
   } while (--i);
 }
-#endif
diff --git a/source/libvpx/vp9/decoder/x86/vp9_idct_mmx.h b/source/libvpx/vp9/decoder/x86/vp9_idct_mmx.h
deleted file mode 100644
index 7d98291..0000000
--- a/source/libvpx/vp9/decoder/x86/vp9_idct_mmx.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  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.
- */
-
-#ifndef VP9_DECODER_X86_VP9_IDCT_MMX_H_
-#define VP9_DECODER_X86_VP9_IDCT_MMX_H_
-
-
-void vp9_dequant_dc_idct_add_mmx(short *input, const short *dq,
-                                 unsigned char *pred, unsigned char *dest,
-                                 int pitch, int stride, int Dc);
-
-void vp9_dequant_idct_add_mmx(short *input, const short *dq, unsigned char *pred,
-                              unsigned char *dest, int pitch, int stride);
-
-#endif /* VP9_DECODER_X86_VP9_IDCT_MMX_H_ */
diff --git a/source/libvpx/vp9/encoder/x86/vp9_dct_sse2_intrinsics.c b/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.c
index 49cb837..49cb837 100644
--- a/source/libvpx/vp9/encoder/x86/vp9_dct_sse2_intrinsics.c
+++ b/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.c
diff --git a/source/libvpx/vp9/vp9cx.mk b/source/libvpx/vp9/vp9cx.mk
index 13785f7..51e24b8 100644
--- a/source/libvpx/vp9/vp9cx.mk
+++ b/source/libvpx/vp9/vp9cx.mk
@@ -109,10 +109,10 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm
 VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm
 VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm
 
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2_intrinsics.c
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
 ifeq ($(HAVE_SSE2),yes)
-vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.d: CFLAGS += -msse2
-vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.o: CFLAGS += -msse2
+vp9/encoder/x86/vp9_dct_sse2.c.d: CFLAGS += -msse2
+vp9/encoder/x86/vp9_dct_sse2.c.o: CFLAGS += -msse2
 endif
 
 
diff --git a/source/libvpx/vp9/vp9dx.mk b/source/libvpx/vp9/vp9dx.mk
index 239ae30..5cab6fc 100644
--- a/source/libvpx/vp9/vp9dx.mk
+++ b/source/libvpx/vp9/vp9dx.mk
@@ -38,10 +38,10 @@ VP9_DX_SRCS-yes := $(filter-out $(VP9_DX_SRCS_REMOVE-yes),$(VP9_DX_SRCS-yes))
 
 VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_idct_blk_sse2.c
 
-VP9_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/vp9_dequantize_x86.c
+VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_dequantize_sse2.c
 ifeq ($(HAVE_SSE2),yes)
-vp9/decoder/x86/vp9_dequantize_x86.c.o: CFLAGS += -msse2
-vp9/decoder/x86/vp9_dequantize_x86.c.d: CFLAGS += -msse2
+vp9/decoder/x86/vp9_dequantize_sse2.c.o: CFLAGS += -msse2
+vp9/decoder/x86/vp9_dequantize_sse2.c.d: CFLAGS += -msse2
 endif
 
 $(eval $(call asm_offsets_template,\