From be6ed6fff4cace79a2c17094ad716bc0944a4274 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Tue, 14 Nov 2006 03:12:29 +0000 Subject: move some CFLAGS settings away from config.* writing section Originally committed as revision 7043 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dsputil.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libavcodec/dsputil.h') diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 9d246a2dfc..60511ee207 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -405,7 +405,7 @@ typedef struct DSPContext { op_pixels_func put_vc1_mspel_pixels_tab[16]; } DSPContext; -void dsputil_static_init(void); +void ff_dsputil_static_init(void); void dsputil_init(DSPContext* p, AVCodecContext *avctx); /** @@ -463,6 +463,8 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){ one or more MultiMedia extension */ int mm_support(void); +extern int ff_mm_flags; + #ifdef __GNUC__ #define DECLARE_ALIGNED_16(t,v) t v __attribute__ ((aligned (16))) #else @@ -481,8 +483,6 @@ int mm_support(void); #define MM_3DNOWEXT 0x0020 /* AMD 3DNowExt */ #define MM_SSE3 0x0040 /* Prescott SSE3 functions */ -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); @@ -495,7 +495,7 @@ static inline void emms(void) #define emms_c() \ {\ - if (mm_flags & MM_MMX)\ + if (ff_mm_flags & MM_MMX)\ emms();\ } @@ -519,8 +519,6 @@ void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); #define MM_IWMMXT 0x0100 /* XScale IWMMXT */ -extern int mm_flags; - void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx); #elif defined(HAVE_MLIB) @@ -549,8 +547,6 @@ void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); #define MM_ALTIVEC 0x0001 /* standard AltiVec */ -extern int mm_flags; - #if defined(HAVE_ALTIVEC) && !defined(CONFIG_DARWIN) #define pixel altivec_pixel #include -- cgit v1.2.3