From: Michael Niedermayer Date: Thu, 8 Dec 2011 17:44:37 +0000 (+0100) Subject: Merge remote-tracking branch 'shariman/wmall' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=15c481614bb410cfa147f8051024d42b01eadff8;p=ffmpeg Merge remote-tracking branch 'shariman/wmall' * shariman/wmall: Pass pointer to integer buffer instead of integer to memcpy Merged-by: Michael Niedermayer --- 15c481614bb410cfa147f8051024d42b01eadff8