From b903fe9137c1ffefc91c1a3713a9bc1444709330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 8 Mar 2010 02:36:22 +0000 Subject: [PATCH] sh4: move dsputil prototypes to header file Originally committed as revision 22312 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/sh4/dsputil_align.c | 1 + libavcodec/sh4/dsputil_sh4.c | 4 +--- libavcodec/sh4/dsputil_sh4.h | 25 +++++++++++++++++++++++++ libavcodec/sh4/idct_sh4.c | 1 + 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 libavcodec/sh4/dsputil_sh4.h diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index 7350b40f60..9e7efdec7a 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 2c86a7aa48..ec06e249c7 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/sh4/dsputil_sh4.h b/libavcodec/sh4/dsputil_sh4.h new file mode 100644 index 0000000000..cd89196c30 --- /dev/null +++ b/libavcodec/sh4/dsputil_sh4.h @@ -0,0 +1,25 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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. + * + * FFmpeg 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_SH4_DSPUTIL_SH4_H +#define AVCODEC_SH4_DSPUTIL_SH4_H + +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 5c461e7917..8d1a31670f 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) */