Commit 875c0fb6 authored by mru's avatar mru

Move declarations of some mmx functions to dsputil_mmx.h

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19739 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 676eeb10
...@@ -618,10 +618,6 @@ void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); ...@@ -618,10 +618,6 @@ void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
extern int mm_flags; extern int mm_flags;
void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
static inline void emms(void) static inline void emms(void)
{ {
__asm__ volatile ("emms;":::"memory"); __asm__ volatile ("emms;":::"memory");
...@@ -634,8 +630,6 @@ static inline void emms(void) ...@@ -634,8 +630,6 @@ static inline void emms(void)
emms();\ emms();\
} }
void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
#elif ARCH_ARM #elif ARCH_ARM
extern int mm_flags; extern int mm_flags;
......
...@@ -150,5 +150,10 @@ extern const double ff_pd_2[2]; ...@@ -150,5 +150,10 @@ extern const double ff_pd_2[2];
"psrlw $15, %%" #regd ::) "psrlw $15, %%" #regd ::)
void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
#endif /* AVCODEC_X86_DSPUTIL_MMX_H */ #endif /* AVCODEC_X86_DSPUTIL_MMX_H */
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "idct_xvid.h" #include "idct_xvid.h"
#include "dsputil_mmx.h"
/*! /*!
* @file libavcodec/x86/idct_sse2_xvid.c * @file libavcodec/x86/idct_sse2_xvid.c
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "libavutil/x86_cpu.h" #include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_mmx.h"
DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={ DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
0x0000000000000000ULL, 0x0000000000000000ULL,
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavcodec/simple_idct.h" #include "libavcodec/simple_idct.h"
#include "dsputil_mmx.h"
/* /*
23170.475006 23170.475006
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment