@@ -102,7 +102,7 @@ static int allocStuff(FilterParam *f, int width, int height){ | |||||
swsF.lumH= swsF.lumV= vec; | swsF.lumH= swsF.lumV= vec; | ||||
swsF.chrH= swsF.chrV= NULL; | swsF.chrH= swsF.chrV= NULL; | ||||
f->preFilterContext= sws_getContext( | f->preFilterContext= sws_getContext( | ||||
width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, get_sws_cpuflags()|SWS_POINT, &swsF, NULL, NULL); | |||||
width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL); | |||||
sws_freeVec(vec); | sws_freeVec(vec); | ||||
vec = sws_getGaussianVec(f->strength, 5.0); | vec = sws_getGaussianVec(f->strength, 5.0); | ||||
@@ -29,7 +29,6 @@ extern float sws_lum_sharpen; | |||||
extern int sws_flags; | extern int sws_flags; | ||||
int get_sws_cpuflags(void); | |||||
struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); | struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); | ||||
#endif /* MPLAYER_VF_SCALE_H */ | #endif /* MPLAYER_VF_SCALE_H */ |
@@ -87,7 +87,7 @@ static int allocStuff(FilterParam *f, int width, int height){ | |||||
swsF.lumH= swsF.lumV= vec; | swsF.lumH= swsF.lumV= vec; | ||||
swsF.chrH= swsF.chrV= NULL; | swsF.chrH= swsF.chrV= NULL; | ||||
f->filterContext= sws_getContext( | f->filterContext= sws_getContext( | ||||
width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC | get_sws_cpuflags(), &swsF, NULL, NULL); | |||||
width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL); | |||||
sws_freeVec(vec); | sws_freeVec(vec); | ||||
@@ -287,10 +287,6 @@ zrmjpeg | |||||
CpuCaps gCpuCaps; //FIXME initialize this so optims work | CpuCaps gCpuCaps; //FIXME initialize this so optims work | ||||
int get_sws_cpuflags(void){ | |||||
return 0; | |||||
} | |||||
static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam) | static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam) | ||||
{ | { | ||||
static int firstTime=1; | static int firstTime=1; | ||||