diff options
| author | Måns Rullgård <mans@mansr.com> | 2007-06-16 10:44:46 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2007-06-16 10:44:46 +0000 |
| commit | a1bee08046ca6f30ea8ea4dd9e7c31c178f4fcfd (patch) | |
| tree | 2641f445895a63ab7424614749af51394522150f | |
| parent | 1bebfde9e144267ce9f481105e8f63c6c6923b2d (diff) | |
| download | ffmpeg-a1bee08046ca6f30ea8ea4dd9e7c31c178f4fcfd.tar.gz | |
move dsputil_init_foo() out from #ifdef
Originally committed as revision 9330 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dsputil.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index a14480a81d..ecf8e62107 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -470,6 +470,16 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){ one or more MultiMedia extension */ int mm_support(void); +void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); + #define DECLARE_ALIGNED_16(t, v) DECLARE_ALIGNED(16, t, v) #if defined(HAVE_MMX) @@ -507,7 +517,6 @@ static inline void emms(void) #define STRIDE_ALIGN 8 -void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ARMV4L) @@ -521,30 +530,23 @@ void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); extern int mm_flags; -void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx); - #elif defined(HAVE_MLIB) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 -void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); - #elif defined(ARCH_SPARC) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 -void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ALPHA) #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 -void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); - #elif defined(ARCH_POWERPC) #define MM_ALTIVEC 0x0001 /* standard AltiVec */ @@ -560,29 +562,21 @@ extern int mm_flags; #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 -void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); - #elif defined(HAVE_MMI) #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 -void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx); - #elif defined(ARCH_SH4) #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 -void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); - #elif defined(ARCH_BFIN) #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) #define STRIDE_ALIGN 8 -void dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); - #else #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) |