From 4bb9adcff1be7ccbb6b8fab40cd68b3808544edc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 12 Sep 2008 17:28:36 +0000 Subject: 10000l PIX_FMT_MONOWHITE check was really a || 1. Thats what happens when one does not do the full set of tests before each commit and just quickly goes over the diff thinking, "hey its a trivial change". Originally committed as revision 27588 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale/swscale_template.c') diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 3ff9c2bbe2..1dec7b8751 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2675,7 +2675,7 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth, src1= formatConvBuffer; src2= formatConvBuffer+VOFW; } - else if (isGray(srcFormat) || srcFormat==PIX_FMT_MONOBLACK || PIX_FMT_MONOWHITE) + else if (isGray(srcFormat) || srcFormat==PIX_FMT_MONOBLACK || srcFormat==PIX_FMT_MONOWHITE) { return; } -- cgit v1.2.3