From 85cabb8d002f2cd100ced5cc17d87bfc9460d314 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 18 Feb 2014 13:16:11 +0100
Subject: [PATCH] fdct: Move x86-specific declarations to a header in the x86
directory
---
libavcodec/dct-test.c | 1 +
libavcodec/dct.h | 4 ----
libavcodec/x86/fdct.c | 2 +-
libavcodec/x86/fdct.h | 28 ++++++++++++++++++++++++++
libavcodec/x86/fdctdsp_init.c | 2 +-
libavcodec/x86/mpegvideoenc_template.c | 1 +
6 files changed, 32 insertions(+), 6 deletions(-)
create mode 100644 libavcodec/x86/fdct.h
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 4f219645d16..8a601dff751 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -45,6 +45,7 @@
#include "aandcttab.h"
#include "faandct.h"
#include "faanidct.h"
+#include "x86/fdct.h"
#include "x86/idct_xvid.h"
#include "dctref.h"
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 3de10b99c58..3fd4e278334 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -60,8 +60,4 @@ void ff_fdct248_islow_10(int16_t *data);
void ff_j_rev_dct(int16_t *data);
-void ff_fdct_mmx(int16_t *block);
-void ff_fdct_mmxext(int16_t *block);
-void ff_fdct_sse2(int16_t *block);
-
#endif /* AVCODEC_DCT_H */
diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index 6c95439e100..6528b57361f 100644
--- a/libavcodec/x86/fdct.c
+++ b/libavcodec/x86/fdct.c
@@ -32,7 +32,7 @@
#include "libavutil/common.h"
#include "libavutil/x86/asm.h"
-#include "libavcodec/dct.h"
+#include "fdct.h"
#if HAVE_MMX_INLINE
diff --git a/libavcodec/x86/fdct.h b/libavcodec/x86/fdct.h
new file mode 100644
index 00000000000..c94a977e8f8
--- /dev/null
+++ b/libavcodec/x86/fdct.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_X86_FDCT_H
+#define AVCODEC_X86_FDCT_H
+
+#include <stdint.h>
+
+void ff_fdct_mmx(int16_t *block);
+void ff_fdct_mmxext(int16_t *block);
+void ff_fdct_sse2(int16_t *block);
+
+#endif /* AVCODEC_X86_FDCT_H */
diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdctdsp_init.c
index 93fdd6567d5..4e8e4eb60d7 100644
--- a/libavcodec/x86/fdctdsp_init.c
+++ b/libavcodec/x86/fdctdsp_init.c
@@ -20,8 +20,8 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/avcodec.h"
-#include "libavcodec/dct.h"
#include "libavcodec/fdctdsp.h"
+#include "fdct.h"
av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c
index 87965fe114d..1274c13e058 100644
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -25,6 +25,7 @@
#include "libavutil/internal.h"
#include "libavutil/x86/asm.h"
#include "libavcodec/mpegvideo.h"
+#include "fdct.h"
#undef MMREG_WIDTH
#undef MM
--
GitLab