swscale: Add proper ff_ prefix to init functions

They are internal symbols that should not be exported. based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Diego Biurrun committed 10 years ago

Commit facdfe41 parent c0fd2fb5 files · +7 −7Browse files

Unified · Split

5 files

@@ -129,11 +129,11 @@ void (yuyvtoyuv422)(uint8_t ydst, uint8_t udst, uint8_t vdst, · 128 unmodified lines
129	129	* 32-bit C version, and and&add trick by Michael Niedermayer
130	130	*/
131	131
132		−av_cold void sws_rgb2rgb_init(void)
	132	+av_cold void ff_rgb2rgb_init(void)
133	133	{
134	134	rgb2rgb_init_c();
135	135	if (ARCH_X86)
136		− rgb2rgb_init_x86();
	136	+ ff_rgb2rgb_init_x86();
137	137	}
138	138
139	139	void rgb32to24(const uint8_t src, uint8_t dst, int src_size)

@@ -158,8 +158,8 @@ extern void (yuyvtoyuv422)(uint8_t ydst, uint8_t udst, uint8_t vdst, const u · 157 unmodified lines
158	158	int width, int height,
159	159	int lumStride, int chromStride, int srcStride);
160	160
161		−void sws_rgb2rgb_init(void);
	161	+void ff_rgb2rgb_init(void);
162	162
163		−void rgb2rgb_init_x86(void);
	163	+void ff_rgb2rgb_init_x86(void);
164	164
165	165	#endif /* SWSCALE_RGB2RGB_H */

@@ -46,7 +46,7 @@ int main(void) · 45 unmodified lines
46	46	return -1;
47	47
48	48	av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
49		− sws_rgb2rgb_init();
	49	+ ff_rgb2rgb_init();
50	50
51	51	for (funcNum = 0; ; funcNum++) {
52	52	struct func_info_s {

@@ -897,7 +897,7 @@ av_cold int sws_init_context(SwsContext c, SwsFilter srcFilter, · 896 unmodified lines
897	897	flags = c->flags;
898	898	emms_c();
899	899	if (!rgb15to16)
900		− sws_rgb2rgb_init();
	900	+ ff_rgb2rgb_init();
901	901
902	902	unscaled = (srcW == dstW && srcH == dstH);
903	903

@@ -137,7 +137,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; · 136 unmodified lines
137	137
138	138	#endif /* HAVE_INLINE_ASM */
139	139
140		−av_cold void rgb2rgb_init_x86(void)
	140	+av_cold void ff_rgb2rgb_init_x86(void)
141	141	{
142	142	#if HAVE_INLINE_ASM
143	143	int cpu_flags = av_get_cpu_flags();

Keyboard shortcuts