John Koleszar 5f6db3591c Merge remote branch 'origin/master' into experimental
Conflicts:
	vp8/encoder/ratectrl.c
	vp8/encoder/rdopt.c

Change-Id: I4cc58acb432662d2c47aceda1680e52982adbc06
2011-03-23 00:24:25 -04:00
..
2011-02-24 14:35:18 -05:00
2011-02-24 14:35:18 -05:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2011-02-08 17:42:54 -05:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2011-01-07 18:46:29 +00:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00