diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-14 03:18:09 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-14 03:18:09 +0000 |
| commit | 486497e07b4617d9548a5b7347076f1b329bd417 (patch) | |
| tree | 62d096ce30698a41d0e1891814636154a962b92f /libavcodec/armv4l | |
| parent | be6ed6fff4cace79a2c17094ad716bc0944a4274 (diff) | |
revert bad checkin
Originally committed as revision 7044 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/armv4l')
| -rw-r--r-- | libavcodec/armv4l/dsputil_iwmmxt.c | 10 | ||||
| -rw-r--r-- | libavcodec/armv4l/mpegvideo_iwmmxt.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c index 70f14d7fed..d7401e760f 100644 --- a/libavcodec/armv4l/dsputil_iwmmxt.c +++ b/libavcodec/armv4l/dsputil_iwmmxt.c @@ -128,7 +128,7 @@ static void nop(uint8_t *block, const uint8_t *pixels, int line_size, int h) return; } -int ff_mm_flags; /* multimedia extension flags */ +int mm_flags; /* multimedia extension flags */ int mm_support(void) { @@ -137,16 +137,16 @@ int mm_support(void) void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx) { - ff_mm_flags = mm_support(); + mm_flags = mm_support(); if (avctx->dsp_mask) { if (avctx->dsp_mask & FF_MM_FORCE) - ff_mm_flags |= (avctx->dsp_mask & 0xffff); + mm_flags |= (avctx->dsp_mask & 0xffff); else - ff_mm_flags &= ~(avctx->dsp_mask & 0xffff); + mm_flags &= ~(avctx->dsp_mask & 0xffff); } - if (!(ff_mm_flags & MM_IWMMXT)) return; + if (!(mm_flags & MM_IWMMXT)) return; c->add_pixels_clamped = add_pixels_clamped_iwmmxt; diff --git a/libavcodec/armv4l/mpegvideo_iwmmxt.c b/libavcodec/armv4l/mpegvideo_iwmmxt.c index ba42a3939d..1336ac5f8d 100644 --- a/libavcodec/armv4l/mpegvideo_iwmmxt.c +++ b/libavcodec/armv4l/mpegvideo_iwmmxt.c @@ -110,7 +110,7 @@ static void dct_unquantize_h263_inter_iwmmxt(MpegEncContext *s, void MPV_common_init_iwmmxt(MpegEncContext *s) { - if (!(ff_mm_flags & MM_IWMMXT)) return; + if (!(mm_flags & MM_IWMMXT)) return; s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_iwmmxt; #if 0 |