diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-04 09:59:08 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-04 09:59:08 +0000 |
| commit | 7160bb716be07254bde383b1b2298eeff6a3e641 (patch) | |
| tree | f01c7a2125ba5e8bdc866a34b401bc4b9724911c /libavcodec/arm/dsputil_iwmmxt.c | |
| parent | 55127e7b494a0221d79501867e9b81ce185ec7b8 (diff) | |
| download | ffmpeg-7160bb716be07254bde383b1b2298eeff6a3e641.tar.gz | |
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm/dsputil_iwmmxt.c')
| -rw-r--r-- | libavcodec/arm/dsputil_iwmmxt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/arm/dsputil_iwmmxt.c b/libavcodec/arm/dsputil_iwmmxt.c index a23ccfc58f..758d9cbfea 100644 --- a/libavcodec/arm/dsputil_iwmmxt.c +++ b/libavcodec/arm/dsputil_iwmmxt.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/cpu.h" #include "libavcodec/dsputil.h" #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt @@ -153,16 +154,16 @@ static void nop(uint8_t *block, const uint8_t *pixels, int line_size, int h) void ff_dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx) { - int mm_flags = FF_MM_IWMMXT; /* multimedia extension flags */ + int mm_flags = AV_CPU_FLAG_IWMMXT; /* multimedia extension flags */ if (avctx->dsp_mask) { - if (avctx->dsp_mask & FF_MM_FORCE) + if (avctx->dsp_mask & AV_CPU_FLAG_FORCE) mm_flags |= (avctx->dsp_mask & 0xffff); else mm_flags &= ~(avctx->dsp_mask & 0xffff); } - if (!(mm_flags & FF_MM_IWMMXT)) return; + if (!(mm_flags & AV_CPU_FLAG_IWMMXT)) return; c->add_pixels_clamped = add_pixels_clamped_iwmmxt; |