summaryrefslogtreecommitdiffstats
path: root/libswscale/swscale_template.c
diff options
context:
space:
mode:
authorlucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-20 15:58:15 +0000
committerlucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-20 15:58:15 +0000
commit774b22c0d1eb360b93e614f333aefefbc0c0bad3 (patch)
tree099d57161543fc2317a7dbcf99f20efa30857eb9 /libswscale/swscale_template.c
parentfe4efe729e557fc7325f241e00c817a2565955b8 (diff)
downloadmpv-774b22c0d1eb360b93e614f333aefefbc0c0bad3.tar.bz2
mpv-774b22c0d1eb360b93e614f333aefefbc0c0bad3.tar.xz
Fix compilation of non-MMX code with gcc 2.95
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21702 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/swscale_template.c')
-rw-r--r--libswscale/swscale_template.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index e725a3bb0a..ee2c9276f5 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -1730,7 +1730,6 @@ static inline void RENAME(yuy2ToY)(uint8_t *dst, uint8_t *src, long width)
static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
{
- assert(src1 == src2);
#ifdef HAVE_MMX
asm volatile(
"movq "MANGLE(bm01010101)", %%mm4\n\t"
@@ -1761,6 +1760,7 @@ static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1,
dstV[i]= src1[4*i + 3];
}
#endif
+ assert(src1 == src2);
}
//this is allmost identical to the previous, end exists only cuz yuy2ToY/UV)(dst, src+1, ...) would have 100% unaligned accesses
@@ -1790,7 +1790,6 @@ static inline void RENAME(uyvyToY)(uint8_t *dst, uint8_t *src, long width)
static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
{
- assert(src1 == src2);
#ifdef HAVE_MMX
asm volatile(
"movq "MANGLE(bm01010101)", %%mm4\n\t"
@@ -1821,6 +1820,7 @@ static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1,
dstV[i]= src1[4*i + 2];
}
#endif
+ assert(src1 == src2);
}
static inline void RENAME(bgr32ToY)(uint8_t *dst, uint8_t *src, int width)
@@ -1942,7 +1942,6 @@ static inline void RENAME(bgr24ToY)(uint8_t *dst, uint8_t *src, long width)
static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
{
- assert(src1 == src2);
#ifdef HAVE_MMX
asm volatile(
"mov %3, %%"REG_a" \n\t"
@@ -2072,6 +2071,7 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
dstV[i]= ((RV*r + GV*g + BV*b)>>(RGB2YUV_SHIFT+1)) + 128;
}
#endif
+ assert(src1 == src2);
}
static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width)