[SCM] libav/experimental: simple_idct: Move x86-specific declarations to a header in the x86 directory

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5dcc201505f71b1e73e9eef12ce89d4eed252ad0
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Feb 18 13:20:01 2014 +0100

    simple_idct: Move x86-specific declarations to a header in the x86 directory

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 8a601df..b278869 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 e257290..7f14aae 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 40ed0ac..f0511f5 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 bbe5a67..1002a78 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/aandcttab.h b/libavcodec/x86/simple_idct.h
similarity index 72%
copy from libavcodec/aandcttab.h
copy to libavcodec/x86/simple_idct.h
index daccb7b..4fc2914 100644
--- a/libavcodec/aandcttab.h
+++ b/libavcodec/x86/simple_idct.h
@@ -16,17 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/**
- * @file
- * AAN (Arai Agui Nakajima) (I)DCT tables
- */
-
-#ifndef AVCODEC_AANDCTTAB_H
-#define AVCODEC_AANDCTTAB_H
+#ifndef AVCODEC_X86_SIMPLE_IDCT_H
+#define AVCODEC_X86_SIMPLE_IDCT_H
 
 #include <stdint.h>
 
-extern const uint16_t ff_aanscales[64];
-extern const uint16_t ff_inv_aanscales[64];
+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_AANDCTTAB_H */
+#endif /* AVCODEC_X86_SIMPLE_IDCT_H */

-- 
Libav/FFmpeg packaging