diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 20:12:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 20:12:31 +0200 |
| commit | 19b79c1429c4234b6ca60ca21e0ed8a152db1343 (patch) | |
| tree | d4f8d48d8f11c13a2b479ec3ed78ac94f3481f4f /libavcodec/aacpsdata.c | |
| parent | 5036c8b17b29623cd86b514474d1c0a81acf1e13 (diff) | |
| parent | b0de1c766329dd8c9960ad1722e2f653160abc1b (diff) | |
| download | ffmpeg-19b79c1429c4234b6ca60ca21e0ed8a152db1343.tar.gz | |
Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'
* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b':
x86: build: Only compile FDCT code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsdata.c')
0 files changed, 0 insertions, 0 deletions