diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-17 11:36:02 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-17 11:36:02 +0000 |
| commit | 2a0c4363cf6019046b289cee2329be3c0c048768 (patch) | |
| tree | c61677bd89d9ad4b048c0501220c7f194eaa8d06 /libswscale/swscale_template.c | |
| parent | 6b328af8ebf4a6bc6d67b663fd164a1f1a51e612 (diff) | |
| download | mpv-2a0c4363cf6019046b289cee2329be3c0c048768.tar.bz2 mpv-2a0c4363cf6019046b289cee2329be3c0c048768.tar.xz | |
BGR/RGB4 byte formats as input
fixing isRGB/BGR() for the byte formats
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22244 b3059339-0415-0410-9bf9-f77b7e298cf2
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; |