videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-11 18:07:56 +02:00
Code Releases Activity

Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.

Browse Source
This commit is contained in:
Reimar Döffinger 2011-06-01 21:30:13 +02:00
parent 3c194f390f
commit 58fd70b04d
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

1
libavfilter/libmpcodecs/vf_scale.h
View File

@ -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 */

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

4
libavfilter/vf_mp.c
View File

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