ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavcodec/arm/dsputil_iwmmxt.c

 /*
  * iWMMXt optimized DSP utils
  * Copyright (c) 2004 AGAWA Koji
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * 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
 #define SET_RND(regd)  __asm__ volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
 #define WAVG2B "wavg2b"
 #include "dsputil_iwmmxt_rnd_template.c"
 #undef DEF
 #undef SET_RND
 #undef WAVG2B
 
@@ skipping 111 matching lines @@
 }
 
 static void nop(uint8_t *block, const uint8_t *pixels, int line_size, int h)
 {
     return;
 }
 
 /* A run time test is not simple. If this file is compiled in
  * then we should install the functions
  */
-int mm_flags = FF_MM_IWMMXT; /* multimedia extension flags */
 
 void ff_dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx)
 {
+    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;
 
     c->clear_blocks = clear_blocks_iwmmxt;
 
     c->put_pixels_tab[0][0] = put_pixels16_iwmmxt;
     c->put_pixels_tab[0][1] = put_pixels16_x2_iwmmxt;
     c->put_pixels_tab[0][2] = put_pixels16_y2_iwmmxt;
     c->put_pixels_tab[0][3] = put_pixels16_xy2_iwmmxt;
     c->put_no_rnd_pixels_tab[0][0] = put_pixels16_iwmmxt;
@@ skipping 21 matching lines @@
 
     c->avg_pixels_tab[1][0] = avg_pixels8_iwmmxt;
     c->avg_pixels_tab[1][1] = avg_pixels8_x2_iwmmxt;
     c->avg_pixels_tab[1][2] = avg_pixels8_y2_iwmmxt;
     c->avg_pixels_tab[1][3] = avg_pixels8_xy2_iwmmxt;
     c->avg_no_rnd_pixels_tab[1][0] = avg_no_rnd_pixels8_iwmmxt;
     c->avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels8_x2_iwmmxt;
     c->avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels8_y2_iwmmxt;
     c->avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels8_xy2_iwmmxt;
 }