# HG changeset patch # User lu_zero # Date 1221697472 0 # Node ID a4ec392de2e75a4632170b6ee36e5fffd32a5ac6 # Parent 2de32a90d2dd81457b511b63cf97538a85fb1ecd Split mono2Y in monowhite and monoblack diff -r 2de32a90d2dd -r a4ec392de2e7 libswscale/swscale_template.c --- a/libswscale/swscale_template.c Thu Sep 18 00:22:53 2008 +0000 +++ b/libswscale/swscale_template.c Thu Sep 18 00:24:32 2008 +0000 @@ -2152,11 +2152,21 @@ } } -static inline void RENAME(mono2Y)(uint8_t *dst, uint8_t *src, long width, int format) +static inline void RENAME(monowhite2Y)(uint8_t *dst, uint8_t *src, long width) { int i, j; for (i=0; i>(7-j))&1)*255; + } +} + +static inline void RENAME(monoblack2Y)(uint8_t *dst, uint8_t *src, long width) +{ + int i, j; + for (i=0; i>(7-j))&1)*255; } @@ -2416,9 +2426,14 @@ RENAME(palToY)(formatConvBuffer, src, srcW, pal); src= formatConvBuffer; } - else if (srcFormat==PIX_FMT_MONOBLACK ||srcFormat==PIX_FMT_MONOWHITE) + else if (srcFormat==PIX_FMT_MONOBLACK) { - RENAME(mono2Y)(formatConvBuffer, src, srcW, srcFormat); + RENAME(monoblack2Y)(formatConvBuffer, src, srcW); + src= formatConvBuffer; + } + else if (srcFormat==PIX_FMT_MONOWHITE) + { + RENAME(monowhite2Y)(formatConvBuffer, src, srcW); src= formatConvBuffer; }