Merge branch 'experimental' into master
authorJohn Koleszar <jkoleszar@google.com>
Fri, 12 Apr 2013 22:33:04 +0000 (15:33 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Tue, 16 Apr 2013 13:49:46 +0000 (06:49 -0700)
commit7f7d1357a2732e0a1c36f3baded7dd14f449e535
tree6bee68dd36c842cd700ee8f670d1380e37acd77d
parent282c963923eb969c146d63e934bbece433a95282
parent868ecb55a1528ca3f19286e7d1551572bf89b642
Merge branch 'experimental' into master

VP9 preview bitstream 2, commit '868ecb55a1528ca3f19286e7d1551572bf89b642'

Conflicts:
vp9/vp9_common.mk

Change-Id: I3f0f6e692c987ff24f98ceafbb86cb9cf64ad8d3
build/make/configure.sh
test/fdct8x8_test.cc
vp8/vp8_cx_iface.c
vp8/vp8_dx_iface.c
vp9/common/x86/vp9_loopfilter_intrin_sse2.c
vp9/encoder/vp9_dct.c
vp9/encoder/vp9_sad_c.c
vp9/vp9_common.mk
vpx_scale/generic/yv12extend.c