diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-07 11:37:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-07 11:37:47 +0200 |
commit | b67cb58520ff455f04687272f4c74c98ed390b1a (patch) | |
tree | 9d01ade0ab60239f9a86fe2e4b65f338c66669f5 /libswscale | |
parent | 57f0f86f72a1a433880a73eb7fc401188b67fac8 (diff) | |
parent | ce1e8045e04ed1a6e9c8c20e48ad3acf9cf664d2 (diff) | |
download | ffmpeg-b67cb58520ff455f04687272f4c74c98ed390b1a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fdct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions