diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 13:20:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-06 13:20:23 +0100 |
| commit | 7456164b5036ed3ec2ff8baadba8dfc7f92cc2e3 (patch) | |
| tree | 4f47f47a1c81b0b2c27302ee859002bf0f1e6528 /libavformat/txd.c | |
| parent | c44b4ee6ea1efaceb5afbba3a01946d0007db654 (diff) | |
| parent | 95d01c3f1c33c079db04e24133ba4a6b00d62d4a (diff) | |
| download | ffmpeg-7456164b5036ed3ec2ff8baadba8dfc7f92cc2e3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/txd.c')
0 files changed, 0 insertions, 0 deletions