diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 10:50:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 10:50:21 +0100 |
| commit | 12fcc626d6ac5da5336f184c2c3f973cf00005f4 (patch) | |
| tree | 74e207314d7b3d945a43ab33216baf5a18d3ddaa /libavformat/oggparsespeex.c | |
| parent | ce58642ed0d6dade63ff1b2467aa573e97c0cc91 (diff) | |
| parent | 42b5688d5ed340c9298650a7b8e88bb8b2c56c8c (diff) | |
| download | ffmpeg-12fcc626d6ac5da5336f184c2c3f973cf00005f4.tar.gz | |
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>
Diffstat (limited to 'libavformat/oggparsespeex.c')
0 files changed, 0 insertions, 0 deletions