swscale: fix types of assembly arguments.

This prevents the following compiler warnings: "warning: initialization from incompatible pointer type". Since the variables are only ever used in inline assembly, their type is actually irrelevant (so the part where it was wrong did not invoke any buggy behaviour).

Ronald S. Bultje committed 15 years ago

Commit 9bcbb251 parent 496d95c1 file · +4 −4Browse files

Unified · Split

libswscale/x86/swscale_template.c+4−4

@@ -178,7 +178,7 @@ static inline void RENAME(yuv2yuv1)(SwsContext c, const int16_t lumSrc, · 177 unmodified lines
178	178	uint8_t *aDest, int dstW, int chrDstW)
179	179	{
180	180	int p= 4;
181		− const uint8_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrUSrc + chrDstW, chrVSrc + chrDstW };
	181	+ const int16_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrUSrc + chrDstW, chrVSrc + chrDstW };
182	182	uint8_t *dst[4]= { aDest, dest, uDest, vDest };
183	183	x86_reg counter[4]= { dstW, dstW, chrDstW, chrDstW };
184	184
@@ -211,7 +211,7 @@ static inline void RENAME(yuv2yuv1_ar)(SwsContext c, const int16_t lumSrc, · 26 unmodified lines
211	211	uint8_t *aDest, int dstW, int chrDstW)
212	212	{
213	213	int p= 4;
214		− const uint8_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrUSrc + chrDstW, chrVSrc + chrDstW };
	214	+ const int16_t *src[4]= { alpSrc + dstW, lumSrc + dstW, chrUSrc + chrDstW, chrVSrc + chrDstW };
215	215	uint8_t *dst[4]= { aDest, dest, uDest, vDest };
216	216	x86_reg counter[4]= { dstW, dstW, chrDstW, chrDstW };
217	217
@@ -2046,7 +2046,7 @@ static inline void RENAME(hyscale_fast)(SwsContext c, int16_t dst, · 1828 unmodified lines
2046	2046	int dstWidth, const uint8_t *src, int srcW,
2047	2047	int xInc)
2048	2048	{
2049		− int32_t *filterPos = c->hLumFilterPos;
	2049	+ int16_t *filterPos = c->hLumFilterPos;
2050	2050	int16_t *filter = c->hLumFilter;
2051	2051	void *mmx2FilterCode= c->lumMmx2FilterCode;
2052	2052	int i;
@@ -2118,7 +2118,7 @@ static inline void RENAME(hcscale_fast)(SwsContext c, int16_t dst1, int16_t *d · 65 unmodified lines
2118	2118	int dstWidth, const uint8_t *src1,
2119	2119	const uint8_t *src2, int srcW, int xInc)
2120	2120	{
2121		− int32_t *filterPos = c->hChrFilterPos;
	2121	+ int16_t *filterPos = c->hChrFilterPos;
2122	2122	int16_t *filter = c->hChrFilter;
2123	2123	void *mmx2FilterCode= c->chrMmx2FilterCode;
2124	2124	int i;

swscale: fix types of assembly arguments.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code