diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:30:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:32:29 +0200 |
| commit | 742c392885b907f4f1cf092d3e62f82b4551abf3 (patch) | |
| tree | d35b00e094492e6ec9408b5583657a408376bafa /libavcodec/jfdctint.c | |
| parent | 65120f628ca5facb8ae5e14d923ed31218bc9409 (diff) | |
| parent | b93b27edb0455287f49182fbf11b68e575f59225 (diff) | |
| download | ffmpeg-742c392885b907f4f1cf092d3e62f82b4551abf3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Make dsputil selectable
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jfdctint.c')
0 files changed, 0 insertions, 0 deletions