From: John Koleszar <jkoleszar@google.com>
Date: Tue, 23 Nov 2010 20:38:20 +0000 (-0800)
Subject: Merge changes I3aed713e,I9ef7f56e,Ic18c60df
X-Git-Tag: v0.9.6~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78cbe51bc304d177ce5790ba4eab46a00f1d4084;p=libvpx

Merge changes I3aed713e,I9ef7f56e,Ic18c60df

* changes:
  vp8_set_maps: remove hard-coded width/height
  vp8mt_alloc_temp_buffers: make prototype return void
  Disable compile warning for ERROR macro
---

78cbe51bc304d177ce5790ba4eab46a00f1d4084