Browse Source

Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.

tags/n0.8
Reimar Döffinger 14 years ago
parent
commit
58fd70b04d
4 changed files with 2 additions and 7 deletions
  1. +1
    -1
      libavfilter/libmpcodecs/vf_sab.c
  2. +0
    -1
      libavfilter/libmpcodecs/vf_scale.h
  3. +1
    -1
      libavfilter/libmpcodecs/vf_smartblur.c
  4. +0
    -4
      libavfilter/vf_mp.c

+ 1
- 1
libavfilter/libmpcodecs/vf_sab.c View File

@@ -102,7 +102,7 @@ static int allocStuff(FilterParam *f, int width, int height){
swsF.lumH= swsF.lumV= vec;
swsF.chrH= swsF.chrV= NULL;
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);
vec = sws_getGaussianVec(f->strength, 5.0);


+ 0
- 1
libavfilter/libmpcodecs/vf_scale.h View File

@@ -29,7 +29,6 @@ extern float sws_lum_sharpen;

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);

#endif /* MPLAYER_VF_SCALE_H */

+ 1
- 1
libavfilter/libmpcodecs/vf_smartblur.c View File

@@ -87,7 +87,7 @@ static int allocStuff(FilterParam *f, int width, int height){
swsF.lumH= swsF.lumV= vec;
swsF.chrH= swsF.chrV= NULL;
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);



+ 0
- 4
libavfilter/vf_mp.c View File

@@ -287,10 +287,6 @@ zrmjpeg
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 int firstTime=1;


Loading…
Cancel
Save