Mercurial > mplayer.hg
comparison libswscale/swscale_template.c @ 26914:f910db69b343
cast to correct type, suppress warnings
author | bcoudurier |
---|---|
date | Sun, 01 Jun 2008 03:28:15 +0000 |
parents | f2d670be6bc8 |
children | 65b8334df960 |
comparison
equal
deleted
inserted
replaced
26913:2ef7839deae2 | 26914:f910db69b343 |
---|---|
2537 RENAME(rgb15ToY)(formatConvBuffer, src, srcW); | 2537 RENAME(rgb15ToY)(formatConvBuffer, src, srcW); |
2538 src= formatConvBuffer; | 2538 src= formatConvBuffer; |
2539 } | 2539 } |
2540 else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE) | 2540 else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE) |
2541 { | 2541 { |
2542 RENAME(palToY)(formatConvBuffer, src, srcW, pal); | 2542 RENAME(palToY)(formatConvBuffer, src, srcW, (uint32_t*)pal); |
2543 src= formatConvBuffer; | 2543 src= formatConvBuffer; |
2544 } | 2544 } |
2545 | 2545 |
2546 #ifdef HAVE_MMX | 2546 #ifdef HAVE_MMX |
2547 // use the new MMX scaler if the mmx2 can't be used (it is faster than the x86 ASM one) | 2547 // use the new MMX scaler if the mmx2 can't be used (it is faster than the x86 ASM one) |
2753 { | 2753 { |
2754 return; | 2754 return; |
2755 } | 2755 } |
2756 else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE) | 2756 else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE) |
2757 { | 2757 { |
2758 RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal); | 2758 RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal); |
2759 src1= formatConvBuffer; | 2759 src1= formatConvBuffer; |
2760 src2= formatConvBuffer+VOFW; | 2760 src2= formatConvBuffer+VOFW; |
2761 } | 2761 } |
2762 | 2762 |
2763 #ifdef HAVE_MMX | 2763 #ifdef HAVE_MMX |