diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-19 00:04:43 +0200 |
commit | 79e1aa7cc7a9ac695c3af361bca72013ef272885 (patch) | |
tree | cc52764dfa4fab2cfc74c6aee5d71b27edbf014b /libmpcodecs/vf_fspp.c | |
parent | 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc (diff) | |
parent | 39cb032fd184a62416f1e62d26e05576cfd8dbe4 (diff) | |
download | mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.bz2 mpv-79e1aa7cc7a9ac695c3af361bca72013ef272885.tar.xz |
Merge svn changes up to r28341
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
Diffstat (limited to 'libmpcodecs/vf_fspp.c')
-rw-r--r-- | libmpcodecs/vf_fspp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index 46c8468745..7c42819d20 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -101,7 +101,7 @@ struct vf_priv_s { //align 16 ! }; -#ifndef HAVE_MMX +#if !HAVE_MMX //This func reads from 1 slice, 1 and clears 0 & 1 static void store_slice_c(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale) @@ -557,10 +557,10 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts) } } -#ifdef HAVE_MMX +#if HAVE_MMX if(gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t"); #endif -#ifdef HAVE_MMX2 +#if HAVE_MMX2 if(gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t"); #endif return vf_next_put_image(vf,dmpi, pts); @@ -702,7 +702,7 @@ const vf_info_t vf_info_fspp = { #define THRESHOLD(r,x,t) if(((unsigned)((x)+t))>t*2) r=(x);else r=0; #define DESCALE(x,n) (((x) + (1 << ((n)-1))) >> n) -#ifdef HAVE_MMX +#if HAVE_MMX DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_382683433)=FIX64(0.382683433, 14); DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_541196100)=FIX64(0.541196100, 14); @@ -738,7 +738,7 @@ static const int16_t FIX_1_082392200=FIX(1.082392200, 13); #endif -#ifndef HAVE_MMX +#if !HAVE_MMX static void column_fidct_c(int16_t* thr_adr, DCTELEM *data, DCTELEM *output, int cnt) { @@ -1598,7 +1598,7 @@ static void column_fidct_mmx(int16_t* thr_adr, DCTELEM *data, DCTELEM *output, #endif // HAVE_MMX -#ifndef HAVE_MMX +#if !HAVE_MMX static void row_idct_c(DCTELEM* workspace, int16_t* output_adr, int output_stride, int cnt) @@ -1867,7 +1867,7 @@ static void row_idct_mmx (DCTELEM* workspace, #endif // HAVE_MMX -#ifndef HAVE_MMX +#if !HAVE_MMX static void row_fdct_c(DCTELEM *data, const uint8_t *pixels, int line_size, int cnt) { |