Merge branch 'origin/eider' into master
authorJohn Koleszar <jkoleszar@google.com>
Fri, 11 May 2012 17:51:05 +0000 (10:51 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 11 May 2012 17:51:05 +0000 (10:51 -0700)
commit44d35f7b257cc3e737a38eb9537d57c3e0479885
treed6a93b58cecf28c982437d8f8f7694d944c1e980
parentc7ca3808322e4ff6a26d2184137c1dfa94f97024
parent297dc90255cf9511bea26c1056aa5e118dae9028
Merge branch 'origin/eider' into master

Conflicts:
vp8/common/entropymode.c
vp8/common/entropymode.h
vp8/encoder/encodeframe.c
vp8/vp8_cx_iface.c

Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265
14 files changed:
configure
libs.mk
vp8/common/entropymode.c
vp8/common/entropymode.h
vp8/decoder/decodframe.c
vp8/decoder/threading.c
vp8/encoder/bitstream.c
vp8/encoder/encodeframe.c
vp8/encoder/ethreading.c
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h
vp8/encoder/temporal_filter.c
vp8/vp8_cx_iface.c
vp8/vp8cx.mk