Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:50:14 +0000 (10:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Dec 2012 09:50:21 +0000 (10:50 +0100)
commit12fcc626d6ac5da5336f184c2c3f973cf00005f4
tree74e207314d7b3d945a43ab33216baf5a18d3ddaa
parentce58642ed0d6dade63ff1b2467aa573e97c0cc91
parent42b5688d5ed340c9298650a7b8e88bb8b2c56c8c
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>
libavresample/utils.c