Commit 9cc4bc97 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS.

parent a19bcf4e
...@@ -37,7 +37,7 @@ struct vf_priv_s { ...@@ -37,7 +37,7 @@ struct vf_priv_s {
int contrast; int contrast;
}; };
#if HAVE_MMX #if HAVE_MMX && HAVE_6REGS
static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, int sstride, static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, int sstride,
int w, int h, int brightness, int contrast) int w, int h, int brightness, int contrast)
{ {
...@@ -224,7 +224,7 @@ static int vf_open(vf_instance_t *vf, char *args) ...@@ -224,7 +224,7 @@ static int vf_open(vf_instance_t *vf, char *args)
if (args) sscanf(args, "%d:%d", &vf->priv->brightness, &vf->priv->contrast); if (args) sscanf(args, "%d:%d", &vf->priv->brightness, &vf->priv->contrast);
process = process_C; process = process_C;
#if HAVE_MMX #if HAVE_MMX && HAVE_6REGS
if(ff_gCpuCaps.hasMMX) process = process_MMX; if(ff_gCpuCaps.hasMMX) process = process_MMX;
#endif #endif
......
...@@ -120,7 +120,7 @@ void create_lut (eq2_param_t *par) ...@@ -120,7 +120,7 @@ void create_lut (eq2_param_t *par)
par->lut_clean = 1; par->lut_clean = 1;
} }
#if HAVE_MMX #if HAVE_MMX && HAVE_6REGS
static static
void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src, void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src,
unsigned w, unsigned h, unsigned dstride, unsigned sstride) unsigned w, unsigned h, unsigned dstride, unsigned sstride)
...@@ -289,7 +289,7 @@ void check_values (eq2_param_t *par) ...@@ -289,7 +289,7 @@ void check_values (eq2_param_t *par)
if ((par->c == 1.0) && (par->b == 0.0) && (par->g == 1.0)) { if ((par->c == 1.0) && (par->b == 0.0) && (par->g == 1.0)) {
par->adjust = NULL; par->adjust = NULL;
} }
#if HAVE_MMX #if HAVE_MMX && HAVE_6REGS
else if (par->g == 1.0 && ff_gCpuCaps.hasMMX) { else if (par->g == 1.0 && ff_gCpuCaps.hasMMX) {
par->adjust = &affine_1d_MMX; par->adjust = &affine_1d_MMX;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment