From 5dcc201505f71b1e73e9eef12ce89d4eed252ad0 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 18 Feb 2014 13:20:01 +0100
Subject: [PATCH] simple_idct: Move x86-specific declarations to a header in
 the x86 directory

---
 libavcodec/dct-test.c         |  1 +
 libavcodec/simple_idct.h      |  4 ----
 libavcodec/x86/idctdsp_init.c |  2 +-
 libavcodec/x86/simple_idct.c  |  3 ++-
 libavcodec/x86/simple_idct.h  | 28 ++++++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 libavcodec/x86/simple_idct.h

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 8a601dff75..b278869f43 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -47,6 +47,7 @@
 #include "faanidct.h"
 #include "x86/fdct.h"
 #include "x86/idct_xvid.h"
+#include "x86/simple_idct.h"
 #include "dctref.h"
 
 // ALTIVEC
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index e25729085e..7f14aae5d0 100644
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -44,10 +44,6 @@ void ff_simple_idct_10(int16_t *block);
  */
 void ff_prores_idct(int16_t *block, const int16_t *qmat);
 
-void ff_simple_idct_mmx(int16_t *block);
-void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
-void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
-
 void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block);
 
 void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block);
diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c
index 40ed0ac5fc..f0511f5115 100644
--- a/libavcodec/x86/idctdsp_init.c
+++ b/libavcodec/x86/idctdsp_init.c
@@ -22,9 +22,9 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/idctdsp.h"
-#include "libavcodec/simple_idct.h"
 #include "idct_xvid.h"
 #include "idctdsp.h"
+#include "simple_idct.h"
 
 /* Input permutation for the simple_idct_mmx */
 static const uint8_t simple_mmx_permutation[64] = {
diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c
index bbe5a67472..1002a782c0 100644
--- a/libavcodec/x86/simple_idct.c
+++ b/libavcodec/x86/simple_idct.c
@@ -19,11 +19,12 @@
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "libavcodec/simple_idct.h"
+
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "idctdsp.h"
+#include "simple_idct.h"
 
 #if HAVE_INLINE_ASM
 
diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h
new file mode 100644
index 0000000000..4fc29141b5
--- /dev/null
+++ b/libavcodec/x86/simple_idct.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_SIMPLE_IDCT_H
+#define AVCODEC_X86_SIMPLE_IDCT_H
+
+#include <stdint.h>
+
+void ff_simple_idct_mmx(int16_t *block);
+void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
+
+#endif /* AVCODEC_X86_SIMPLE_IDCT_H */