diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 12:04:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-12 12:18:26 +0100 |
| commit | 8c0a14d221af1add009829d65a5beb0e5d5d8770 (patch) | |
| tree | e8efab14cdede3d6a84265c4873ad547ee704bf5 /libavcodec/jpegls.c | |
| parent | 03b078721c8e42c413da75f553e740d235092dad (diff) | |
| parent | 2b479bcab0a8365a7c094c5fa44b8cb6da9810d0 (diff) | |
Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'
These patches have not been merged at the request of Carl
* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
build: Drop AVX assembly ifdefs
x86: Require an assembler able to cope with AVX instructions
Conflicts:
libavcodec/x86/fft.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpegls.c')
0 files changed, 0 insertions, 0 deletions