Merge changes I3aed713e,I9ef7f56e,Ic18c60df
authorJohn Koleszar <jkoleszar@google.com>
Tue, 23 Nov 2010 20:38:20 +0000 (12:38 -0800)
committerCode Review <code-review@webmproject.org>
Tue, 23 Nov 2010 20:38:20 +0000 (12:38 -0800)
* changes:
  vp8_set_maps: remove hard-coded width/height
  vp8mt_alloc_temp_buffers: make prototype return void
  Disable compile warning for ERROR macro


Trivial merge