diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-13 01:56:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-13 01:56:33 +0100 |
| commit | b25a265a5c921d2d223a8aeff2f918894d515934 (patch) | |
| tree | 480f9648f685220520a344ac293f66e307abfc5c /libavutil/cpu.h | |
| parent | 2d38081b4f65f23077cb1b27f2d08c82c45afa05 (diff) | |
| parent | bd3e07c82ae558c2cc3616115161827630826ec1 (diff) | |
| download | ffmpeg-b25a265a5c921d2d223a8aeff2f918894d515934.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm-mpeg: convert to bytestream2 API
Revert "h264: clear trailing bits in partially parsed NAL units"
remove iwmmxt optimizations
mimic: do not continue if swap_buf_size is 0
mimic: convert to bytestream2 API
frwu: use MKTAG to check marker instead of AV_RL32
txd: port to bytestream2 API
c93: convert to bytestream2 API
iff: make .long_name more descriptive
FATE: add test for cdxl demuxer
rtsp: Fix a typo
Conflicts:
libavcodec/arm/dsputil_iwmmxt.c
libavcodec/arm/dsputil_iwmmxt_rnd_template.c
libavcodec/arm/mpegvideo_iwmmxt.c
libavcodec/c93.c
libavcodec/txd.c
libavutil/arm/cpu.c
tests/fate/demux.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.h')
| -rw-r--r-- | libavutil/cpu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h index e448da6cdc..638374db4d 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -43,7 +43,6 @@ #define AV_CPU_FLAG_CMOV 0x1000000 ///< supports cmov instruction #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions -#define AV_CPU_FLAG_IWMMXT 0x0100 ///< XScale IWMMXT #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard /** @@ -67,7 +66,6 @@ void av_force_cpu_flags(int flags); attribute_deprecated void av_set_cpu_flags_mask(int mask); /* The following CPU-specific functions shall not be called directly. */ -int ff_get_cpu_flags_arm(void); int ff_get_cpu_flags_ppc(void); int ff_get_cpu_flags_x86(void); |