Browse code

Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.

Reimar Döffinger authored on 2011/06/02 04:30:13
Showing 4 changed files
... ...
@@ -102,7 +102,7 @@ static int allocStuff(FilterParam *f, int width, int height){
102 102
     swsF.lumH= swsF.lumV= vec;
103 103
     swsF.chrH= swsF.chrV= NULL;
104 104
     f->preFilterContext= sws_getContext(
105
-        width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, get_sws_cpuflags()|SWS_POINT, &swsF, NULL, NULL);
105
+        width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL);
106 106
 
107 107
     sws_freeVec(vec);
108 108
     vec = sws_getGaussianVec(f->strength, 5.0);
... ...
@@ -29,7 +29,6 @@ extern float sws_lum_sharpen;
29 29
 
30 30
 extern int sws_flags;
31 31
 
32
-int get_sws_cpuflags(void);
33 32
 struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
34 33
 
35 34
 #endif /* MPLAYER_VF_SCALE_H */
... ...
@@ -87,7 +87,7 @@ static int allocStuff(FilterParam *f, int width, int height){
87 87
     swsF.lumH= swsF.lumV= vec;
88 88
     swsF.chrH= swsF.chrV= NULL;
89 89
     f->filterContext= sws_getContext(
90
-        width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC | get_sws_cpuflags(), &swsF, NULL, NULL);
90
+        width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL);
91 91
 
92 92
     sws_freeVec(vec);
93 93
 
... ...
@@ -287,10 +287,6 @@ zrmjpeg
287 287
 CpuCaps gCpuCaps; //FIXME initialize this so optims work
288 288
 
289 289
 
290
-int get_sws_cpuflags(void){
291
-    return 0;
292
-}
293
-
294 290
 static void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam)
295 291
 {
296 292
         static int firstTime=1;