John Koleszar a5074a8b8b Merge remote branch 'internal/upstream' into HEAD
Conflicts:
	vp8/encoder/encodeframe.c
	vp8/encoder/rdopt.c

Change-Id: I3c66714e704b22569aff701cc5b9b2a5b70989f3
2011-05-16 09:09:36 -04:00
..
2011-05-06 08:59:52 +03:00
2011-02-11 11:09:00 -05:00
2011-02-10 15:09:44 -05:00