Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 25 Feb 2011 05:05:08 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 25 Feb 2011 05:05:08 +0000 (00:05 -0500)
commit1a7ce50a6c91af97291aa727483030a14a58859f
tree983477557f8eb87a47341c8956a57c2b0ed4385b
parentf8d4a81af20705c4a023689e9c347f079ffe02e5
parent861175ef001e5211ad9e60221e04da7fd1970d31
Merge remote branch 'origin/master' into experimental

Change-Id: I52f21ff6f9a1dca7099a8459657f6f288c5bfe40
vp8/encoder/encodemb.c
vp8/encoder/firstpass.c
vp8/encoder/rdopt.c
vpx/vp8cx.h