Mercurial > mplayer.hg
changeset 29639:26a355ffe458
Add several HAVE_EBX_AVAILABLE conditions where necessary
| author | reimar |
|---|---|
| date | Mon, 14 Sep 2009 14:47:56 +0000 |
| parents | 209b805a26a9 |
| children | f49560a603bf |
| files | libmpcodecs/vf_ilpack.c libmpcodecs/vf_ivtc.c libmpcodecs/vf_tfields.c |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_ilpack.c Mon Sep 14 13:16:35 2009 +0000 +++ b/libmpcodecs/vf_ilpack.c Mon Sep 14 14:47:56 2009 +0000 @@ -88,6 +88,7 @@ pack_nn_C(dst, y, u, v, (w&7)); } +#if HAVE_EBX_AVAILABLE static void pack_li_0_MMX(unsigned char *dst, unsigned char *y, unsigned char *u, unsigned char *v, int w, int us, int vs) { @@ -307,6 +308,7 @@ ); pack_li_1_C(dst, y, u, v, (w&15), us, vs); } +#endif /* HAVE_EBX_AVAILABLE */ #endif static pack_func_t *pack_nn; @@ -399,8 +401,10 @@ #if HAVE_MMX if(gCpuCaps.hasMMX) { pack_nn = (pack_func_t *)pack_nn_MMX; +#if HAVE_EBX_AVAILABLE pack_li_0 = pack_li_0_MMX; pack_li_1 = pack_li_1_MMX; +#endif } #endif
--- a/libmpcodecs/vf_ivtc.c Mon Sep 14 13:16:35 2009 +0000 +++ b/libmpcodecs/vf_ivtc.c Mon Sep 14 14:47:56 2009 +0000 @@ -40,7 +40,7 @@ F_SHOW }; -#if HAVE_MMX +#if HAVE_MMX && HAVE_EBX_AVAILABLE static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char *new, int os, int ns) { int i; @@ -516,7 +516,7 @@ p->first = 1; if (args) sscanf(args, "%d", &p->drop); block_diffs = block_diffs_C; -#if HAVE_MMX +#if HAVE_MMX && HAVE_EBX_AVAILABLE if(gCpuCaps.hasMMX) block_diffs = block_diffs_MMX; #endif return 1;
--- a/libmpcodecs/vf_tfields.c Mon Sep 14 13:16:35 2009 +0000 +++ b/libmpcodecs/vf_tfields.c Mon Sep 14 14:47:56 2009 +0000 @@ -168,6 +168,7 @@ __asm__ volatile("emms \n\t" : : : "memory"); } +#if HAVE_EBX_AVAILABLE static void qpel_4tap_MMX(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up) { int i, j, ssd=ss; @@ -247,6 +248,7 @@ if (!up) fast_memcpy(d, s, w); __asm__ volatile("emms \n\t" : : : "memory"); } +#endif /* HAVE_EBX_AVAILABLE */ #endif static inline int clamp(int a) @@ -480,8 +482,10 @@ qpel_4tap = qpel_4tap_C; #if HAVE_MMX if(gCpuCaps.hasMMX) qpel_li = qpel_li_MMX; +#if HAVE_EBX_AVAILABLE if(gCpuCaps.hasMMX) qpel_4tap = qpel_4tap_MMX; #endif +#endif #if HAVE_MMX2 if(gCpuCaps.hasMMX2) qpel_li = qpel_li_MMX2; #endif