diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-02-17 11:36:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-02-17 11:36:02 +0000 |
| commit | 18064f5cf38730b70a6587c389e1838b00c753bb (patch) | |
| tree | 2c352a865690fe940002fcc4de74f9a7f1fb52c0 /libswscale/swscale_template.c | |
| parent | 49c8132b17ec26666d71ee94a50f421b84feeb35 (diff) | |
BGR/RGB4 byte formats as input
fixing isRGB/BGR() for the byte formats
Originally committed as revision 22244 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale_template.c')
| -rw-r--r-- | libswscale/swscale_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 928bf97320..86598a2860 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2551,7 +2551,7 @@ static inline void RENAME(hyscale)(uint16_t *dst, long dstWidth, uint8_t *src, i RENAME(rgb15ToY)(formatConvBuffer, src, srcW); src= formatConvBuffer; } - else if(srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8) + else if(srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE) { RENAME(palToY)(formatConvBuffer, src, srcW, pal); src= formatConvBuffer; @@ -2767,7 +2767,7 @@ inline static void RENAME(hcscale)(uint16_t *dst, long dstWidth, uint8_t *src1, { return; } - else if(srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8) + else if(srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE) { RENAME(palToUV)(formatConvBuffer, formatConvBuffer+2048, src1, src2, srcW, pal); src1= formatConvBuffer; |