diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:26:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:27:11 +0100 |
| commit | 84833b028bf3fa08d09939330989df8d8820cd59 (patch) | |
| tree | 532812ffae1097453064a82f86b10931fb55cc25 /doc | |
| parent | 28c0678eb764b8d10faf1a988d2f0e2dc79c96a5 (diff) | |
| parent | 5707af8d0b9c5a7e8a742a11798e406f99d78cea (diff) | |
| download | ffmpeg-84833b028bf3fa08d09939330989df8d8820cd59.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Drop some unused function arguments
x86: Fix assembly with NASM
x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions