aes3: use lookup table to speed up bit order inversion

[vlc] / modules / codec / avcodec / cpu.c

diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c
index 597d3676a0ae5aa40e72ec16ca7b805f16aa64c6..29726c1ed17485c35cd7c65eb77e96f6c1df7ea7 100644 (file)
--- a/modules/codec/avcodec/cpu.c
+++ b/modules/codec/avcodec/cpu.c
@@ -1,21 +1,21 @@
 /*****************************************************************************
  * cpu.c: CPU capabilities for libavcodec
  *****************************************************************************
- * Copyright (C) 1999-2012 the VideoLAN team
+ * Copyright (C) 1999-2012 VLC authors and VideoLAN
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program 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.
  *
  * This program 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 General Public License for more details.
+ * 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 General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
 
 #define HAVE_MMX 1
 #include <libavcodec/avcodec.h>
-#include "avcodec.h"
+#include "avcommon.h"
 
 /**
  * Maps CPU capabilities computed by VLC to libav DSP mask.
@@ -40,7 +40,7 @@ unsigned GetVlcDspMask( void )
     if( !vlc_CPU_MMX() )
         mask |= AV_CPU_FLAG_MMX;
     if( !vlc_CPU_MMXEXT() )
-        mask |= AV_CPU_FLAG_MMX2;
+        mask |= AV_CPU_FLAG_MMXEXT;
     if( !vlc_CPU_3dNOW() )
         mask |= AV_CPU_FLAG_3DNOW;
     if( !vlc_CPU_SSE() )
@@ -83,7 +83,7 @@ unsigned GetVlcDspMask( void )
 #endif
 
 #if defined ( __arm__)
-#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(29<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 29, 0)
     if( !vlc_CPU_ARM_NEON() )
         mask |= AV_CPU_FLAG_NEON;
 #endif