[SCM] libav/experimental: sparc: fix dsputil prototypes

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ad40380240a4db5ba7effb18b2951e977d5034a4
Author: Måns Rullgård <mans at mansr.com>
Date:   Wed Mar 10 22:24:42 2010 +0000

    sparc: fix dsputil prototypes
    
    Originally committed as revision 22440 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c
index 7aac4e9..9c85ae6 100644
--- a/libavcodec/sparc/dsputil_vis.c
+++ b/libavcodec/sparc/dsputil_vis.c
@@ -27,13 +27,10 @@
 #include <inttypes.h>
 
 #include "libavcodec/dsputil.h"
+#include "dsputil_vis.h"
 
 #include "vis.h"
 
-void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data);
-void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data);
-void ff_simple_idct_vis(DCTELEM *data);
-
 /* The trick used in some of this file is the formula from the MMX
  * motion comp code, which is:
  *
diff --git a/libavcodec/sh4/dsputil_sh4.h b/libavcodec/sparc/dsputil_vis.h
similarity index 74%
copy from libavcodec/sh4/dsputil_sh4.h
copy to libavcodec/sparc/dsputil_vis.h
index 2c1f77c..97ff965 100644
--- a/libavcodec/sh4/dsputil_sh4.h
+++ b/libavcodec/sparc/dsputil_vis.h
@@ -16,13 +16,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_SH4_DSPUTIL_SH4_H
-#define AVCODEC_SH4_DSPUTIL_SH4_H
+#ifndef AVCODEC_SPARC_DSPUTIL_VIS_H
+#define AVCODEC_SPARC_DSPUTIL_VIS_H
 
-#include "libavcodec/avcodec.h"
+#include <stdint.h>
 #include "libavcodec/dsputil.h"
 
-void idct_sh4(DCTELEM *block);
-void dsputil_init_align(DSPContext* c, AVCodecContext *avctx);
+void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data);
+void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data);
+void ff_simple_idct_vis(DCTELEM *data);
 
 #endif
diff --git a/libavcodec/sparc/simple_idct_vis.c b/libavcodec/sparc/simple_idct_vis.c
index 8346a36..d98bf37 100644
--- a/libavcodec/sparc/simple_idct_vis.c
+++ b/libavcodec/sparc/simple_idct_vis.c
@@ -23,6 +23,7 @@
  */
 
 #include "libavcodec/dsputil.h"
+#include "dsputil_vis.h"
 
 static const DECLARE_ALIGNED(8, int16_t, coeffs)[28] = {
     - 1259,- 1259,- 1259,- 1259,

-- 
Libav/FFmpeg packaging