From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 12 Dec 2012 09:50:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~7280
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12fcc626d6ac5da5336f184c2c3f973cf00005f4;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix segfault due to overlooked change needed in 14758e3
  x86inc: support stack mem allocation and re-alignment in PROLOGUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

12fcc626d6ac5da5336f184c2c3f973cf00005f4