diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 12:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 12:16:08 +0200 |
| commit | 3777e6b3bf65be9a925187a9d008c5d422fe17b5 (patch) | |
| tree | 6ab9a542129dd1bb6ac4ff6b572d714d1dba40c3 /libswscale | |
| parent | 9317b73f11c34e550a2ffcf01540824dbaa36036 (diff) | |
| parent | b93e934aeea44f3e92f0acd960e5d10151f14379 (diff) | |
| download | ffmpeg-3777e6b3bf65be9a925187a9d008c5d422fe17b5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
fate: list lavfi tests in a makefile
Conflicts:
configure
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions