Port remove of get_sws_cpuflags from MPlayer's libmpcodecs.

Reimar Döffinger committed 15 years ago

Commit 58fd70b1 parent 3c194f34 files · +2 −7Browse files

Unified · Split

4 files

libavfilter/libmpcodecs/vf_sab.c +1 −1
libavfilter/libmpcodecs/vf_scale.h +0 −1
libavfilter/libmpcodecs/vf_smartblur.c +1 −1
libavfilter/vf_mp.c +0 −4

libavfilter/libmpcodecs/vf_sab.c+1−1

@@ -102,7 +102,7 @@ static int allocStuff(FilterParam *f, int width, int height){ · 101 unmodified lines
102	swsF.lumH= swsF.lumV= vec;	102	swsF.lumH= swsF.lumV= vec;
103	swsF.chrH= swsF.chrV= NULL;	103	swsF.chrH= swsF.chrV= NULL;
104	f->preFilterContext= sws_getContext(	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	sws_freeVec(vec);	107	sws_freeVec(vec);
108	vec = sws_getGaussianVec(f->strength, 5.0);	108	vec = sws_getGaussianVec(f->strength, 5.0);

libavfilter/libmpcodecs/vf_scale.h+0−1

@@ -29,7 +29,6 @@ extern float sws_lum_sharpen; · 28 unmodified lines
29		29
30	extern int sws_flags;	30	extern int sws_flags;
31		31
32	int get_sws_cpuflags(void);
33	struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);	32	struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
34		33
35	#endif /* MPLAYER_VF_SCALE_H */	34	#endif /* MPLAYER_VF_SCALE_H */

libavfilter/libmpcodecs/vf_smartblur.c+1−1

@@ -87,7 +87,7 @@ static int allocStuff(FilterParam *f, int width, int height){ · 86 unmodified lines
87	swsF.lumH= swsF.lumV= vec;	87	swsF.lumH= swsF.lumV= vec;
88	swsF.chrH= swsF.chrV= NULL;	88	swsF.chrH= swsF.chrV= NULL;
89	f->filterContext= sws_getContext(	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	sws_freeVec(vec);	92	sws_freeVec(vec);
93		93

libavfilter/vf_mp.c+0−4

@@ -287,10 +287,6 @@ zrmjpeg · 286 unmodified lines
287	CpuCaps gCpuCaps; //FIXME initialize this so optims work	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	static void sws_getFlagsAndFilterFromCmdLine(int flags, SwsFilter srcFilterParam, SwsFilter *dstFilterParam)	290	static void sws_getFlagsAndFilterFromCmdLine(int flags, SwsFilter srcFilterParam, SwsFilter *dstFilterParam)
295	{	291	{
296	static int firstTime=1;	292	static int firstTime=1;