[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 12 10:50:14 2012 +0100| [12fcc626d6ac5da5336f184c2c3f973cf00005f4] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12fcc626d6ac5da5336f184c2c3f973cf00005f4
---