diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-14 03:18:09 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-14 03:18:09 +0000 |
| commit | 486497e07b4617d9548a5b7347076f1b329bd417 (patch) | |
| tree | 62d096ce30698a41d0e1891814636154a962b92f /libavcodec/dsputil.h | |
| parent | be6ed6fff4cace79a2c17094ad716bc0944a4274 (diff) | |
| download | ffmpeg-486497e07b4617d9548a5b7347076f1b329bd417.tar.gz | |
revert bad checkin
Originally committed as revision 7044 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 60511ee207..9d246a2dfc 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 ff_dsputil_static_init(void); +void dsputil_static_init(void); void dsputil_init(DSPContext* p, AVCodecContext *avctx); /** @@ -463,8 +463,6 @@ 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 @@ -483,6 +481,8 @@ extern int ff_mm_flags; #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 (ff_mm_flags & MM_MMX)\ + if (mm_flags & MM_MMX)\ emms();\ } @@ -519,6 +519,8 @@ 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) @@ -547,6 +549,8 @@ 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 <altivec.h> |