[FFmpeg-devel] [PATCH 3/7] avcodec: use new constants in C inline assembly

[James Darnley]

---
 libavcodec/x86/cavsdsp.c    |  2 +-
 libavcodec/x86/constants.h  | 66 ---------------------------------------------
 libavcodec/x86/inline_asm.h |  2 +-
 libavcodec/x86/vc1dsp_mmx.c |  2 +-
 4 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 libavcodec/x86/constants.h

diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c
index 4b20e65..1fee172 100644
--- a/libavcodec/x86/cavsdsp.c
+++ b/libavcodec/x86/cavsdsp.c
@@ -29,7 +29,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/cavsdsp.h"
 #include "libavcodec/idctdsp.h"
-#include "constants.h"
+#include "libavutil/x86/constants.h"
 #include "fpel.h"
 #include "idctdsp.h"
 #include "config.h"
diff --git a/libavcodec/x86/constants.h b/libavcodec/x86/constants.h
deleted file mode 100644
index 33dbb65..0000000
--- a/libavcodec/x86/constants.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * MMX/SSE constants used across x86 dsp optimizations.
- *
- * 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
- */
-
-#ifndef AVCODEC_X86_CONSTANTS_H
-#define AVCODEC_X86_CONSTANTS_H
-
-#include <stdint.h>
-
-#include "libavutil/x86/asm.h"
-
-extern const ymm_reg  ff_pw_1;
-extern const ymm_reg  ff_pw_2;
-extern const xmm_reg  ff_pw_3;
-extern const xmm_reg  ff_pw_4;
-extern const xmm_reg  ff_pw_5;
-extern const xmm_reg  ff_pw_8;
-extern const xmm_reg  ff_pw_9;
-extern const uint64_t ff_pw_15;
-extern const xmm_reg  ff_pw_16;
-extern const xmm_reg  ff_pw_18;
-extern const xmm_reg  ff_pw_20;
-extern const xmm_reg  ff_pw_32;
-extern const uint64_t ff_pw_42;
-extern const uint64_t ff_pw_53;
-extern const xmm_reg  ff_pw_64;
-extern const uint64_t ff_pw_96;
-extern const uint64_t ff_pw_128;
-extern const ymm_reg  ff_pw_255;
-extern const ymm_reg  ff_pw_512;
-extern const ymm_reg  ff_pw_1023;
-extern const ymm_reg  ff_pw_1024;
-extern const ymm_reg  ff_pw_2048;
-extern const ymm_reg  ff_pw_4096;
-extern const ymm_reg  ff_pw_8192;
-extern const ymm_reg  ff_pw_m1;
-
-extern const ymm_reg  ff_pb_0;
-extern const ymm_reg  ff_pb_1;
-extern const ymm_reg  ff_pb_2;
-extern const ymm_reg  ff_pb_3;
-extern const xmm_reg  ff_pb_80;
-extern const xmm_reg  ff_pb_FE;
-extern const uint64_t ff_pb_FC;
-
-extern const xmm_reg  ff_ps_neg;
-
-extern const ymm_reg  ff_pd_1;
-
-#endif /* AVCODEC_X86_CONSTANTS_H */
diff --git a/libavcodec/x86/inline_asm.h b/libavcodec/x86/inline_asm.h
index 3e65a76..ab323f3 100644
--- a/libavcodec/x86/inline_asm.h
+++ b/libavcodec/x86/inline_asm.h
@@ -21,7 +21,7 @@
 #ifndef AVCODEC_X86_INLINE_ASM_H
 #define AVCODEC_X86_INLINE_ASM_H
 
-#include "constants.h"
+#include "libavutil/x86/constants.h"
 
 #define MOVQ_WONE(regd) \
     __asm__ volatile ( \
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
index a7eb59d..2ec07af 100644
--- a/libavcodec/x86/vc1dsp_mmx.c
+++ b/libavcodec/x86/vc1dsp_mmx.c
@@ -29,7 +29,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
-#include "constants.h"
+#include "libavutil/x86/constants.h"
 #include "fpel.h"
 #include "vc1dsp.h"
 
-- 
2.5.3