[SCM] libav/experimental: sh4: move dsputil prototypes to header file

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b903fe9137c1ffefc91c1a3713a9bc1444709330
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Mar 8 02:36:22 2010 +0000

    sh4: move dsputil prototypes to header file
    
    Originally committed as revision 22312 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c
index 7350b40..9e7efde 100644
--- a/libavcodec/sh4/dsputil_align.c
+++ b/libavcodec/sh4/dsputil_align.c
@@ -23,6 +23,7 @@
 
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
+#include "dsputil_sh4.h"
 
 
 #define         LP(p)           *(uint32_t*)(p)
diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c
index 2c86a7a..ec06e24 100644
--- a/libavcodec/sh4/dsputil_sh4.c
+++ b/libavcodec/sh4/dsputil_sh4.c
@@ -22,6 +22,7 @@
 
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
+#include "dsputil_sh4.h"
 #include "sh4.h"
 
 static void memzero_align8(void *dst,size_t size)
@@ -51,7 +52,6 @@ static void clear_blocks_sh4(DCTELEM *blocks)
         memzero_align8(blocks,sizeof(DCTELEM)*6*64);
 }
 
-void idct_sh4(DCTELEM *block);
 static void idct_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
         int i;
@@ -89,8 +89,6 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block)
         }
 }
 
-void dsputil_init_align(DSPContext* c, AVCodecContext *avctx);
-
 void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx)
 {
         const int idct_algo= avctx->idct_algo;
diff --git a/libavcodec/arm/mpegvideo_arm.h b/libavcodec/sh4/dsputil_sh4.h
similarity index 82%
copy from libavcodec/arm/mpegvideo_arm.h
copy to libavcodec/sh4/dsputil_sh4.h
index 4874c86..cd89196 100644
--- a/libavcodec/arm/mpegvideo_arm.h
+++ b/libavcodec/sh4/dsputil_sh4.h
@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ARM_MPEGVIDEO_H
-#define AVCODEC_ARM_MPEGVIDEO_H
+#ifndef AVCODEC_SH4_DSPUTIL_SH4_H
+#define AVCODEC_SH4_DSPUTIL_SH4_H
 
-void MPV_common_init_iwmmxt(MpegEncContext *s);
-void MPV_common_init_armv5te(MpegEncContext *s);
+void idct_sh4(DCTELEM *block);
+void dsputil_init_align(DSPContext* c, AVCodecContext *avctx);
 
 #endif
diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c
index 5c461e7..8d1a316 100644
--- a/libavcodec/sh4/idct_sh4.c
+++ b/libavcodec/sh4/idct_sh4.c
@@ -21,6 +21,7 @@
  */
 
 #include "libavcodec/dsputil.h"
+#include "dsputil_sh4.h"
 #include "sh4.h"
 
 #define c1      1.38703984532214752434  /* sqrt(2)*cos(1*pi/16) */

-- 
Libav/FFmpeg packaging