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_yadif.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_yadif.c')
-rw-r--r-- | libmpcodecs/vf_yadif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index 2c80a2ec5b..6f324dc4fa 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -69,7 +69,7 @@ static void store_ref(struct vf_priv_s *p, uint8_t *src[3], int src_stride[3], i } } -#if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) +#if HAVE_MMX && defined(NAMED_ASM_ARGS) #define LOAD4(mem,dst) \ "movd "mem", "#dst" \n\t"\ @@ -282,7 +282,7 @@ static void filter_line_mmx2(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, u #undef CHECK2 #undef FILTER -#endif /* defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) */ +#endif /* HAVE_MMX && defined(NAMED_ASM_ARGS) */ static void filter_line_c(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int refs, int parity){ int x; @@ -364,7 +364,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], int dst_stride[3], int } } } -#if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) +#if HAVE_MMX && defined(NAMED_ASM_ARGS) if(gCpuCaps.hasMMX2) __asm__ volatile("emms \n\t" : : : "memory"); #endif } @@ -503,7 +503,7 @@ static int open(vf_instance_t *vf, char* args){ if (args) sscanf(args, "%d:%d", &vf->priv->mode, &vf->priv->parity); filter_line = filter_line_c; -#if defined(HAVE_MMX) && defined(NAMED_ASM_ARGS) +#if HAVE_MMX && defined(NAMED_ASM_ARGS) if(gCpuCaps.hasMMX2) filter_line = filter_line_mmx2; #endif |