diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 20:39:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 21:03:28 +0200 |
| commit | 039e9fe01ca27606a0ec1a944d51041541e10aab (patch) | |
| tree | 9fc96837e878cdb2c13b6016d9f3d69785570488 /libavutil/cpu.h | |
| parent | 8b421fad24acbba69935caf2a2775bd04f8a707a (diff) | |
| parent | 7c29377b702783680b223a12503df784b1808086 (diff) | |
| download | ffmpeg-039e9fe01ca27606a0ec1a944d51041541e10aab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
lavfi: reclassify showfiltfmts as a TESTPROG
graph2dot: fix printf format specifier
swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32.
vp8: loopfilter >=sse2 functions need aligned stack on x86-32.
amr: remove shift out of the AMR_BIT() macro.
dsputilenc: group yasm and inline asm function pointer assignment.
mov: use forward declaration of a function instead of a table.
Clarify Doxygen comment for FF_API_* #defines.
configure: simplify get_version()
Create version.h headers for libraries that lack them
gitignore: Use full path instead of relative path to specify patterns
mpegvideo: remove VLAs
Add XTEA encryption support in libavutil
Add Blowfish encryption support in libavutil
eval: Add the isinf() function and tests for it
flacdec: move lpc filter to flacdsp
flacdec: split off channel decorrelation as flacdsp
avplay: Add an option for not limiting the input buffer size
FATE: add a test for WMA cover art.
FATE: add a test for apetag cover art
...
Conflicts:
.gitignore
configure
ffplay.c
libavcodec/Makefile
libavcodec/error_resilience.c
libavcodec/mpegvideo.c
libavcodec/ratecontrol.c
libavdevice/avdevice.h
libavfilter/Makefile
libavfilter/filtfmts.c
libavfilter/version.h
libavformat/mov.c
libavformat/version.h
libavutil/Makefile
libavutil/avutil.h
libavutil/version.h
libswscale/swscale.h
libswscale/x86/swscale_mmx.c
tests/fate/libavutil.mak
tests/lavfi-regression.sh
tools/graph2dot.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.h')
| -rw-r--r-- | libavutil/cpu.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 0cd8117159..d8ec32cdc2 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -22,7 +22,6 @@ #define AVUTIL_CPU_H #include "attributes.h" -#include "version.h" #define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR) */ @@ -43,11 +42,11 @@ #define AV_CPU_FLAG_AVX 0x4000 ///< AVX functions: requires OS support even if YMM registers aren't used #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions -#if LIBAVUTIL_VERSION_MAJOR <52 +// #if LIBAVUTIL_VERSION_MAJOR <52 #define AV_CPU_FLAG_CMOV 0x1001000 ///< supports cmov instruction -#else -#define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction -#endif +// #else +// #define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction +// #endif #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard |