summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-12 17:28:36 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-09-12 17:28:36 +0000
commitd28a3ad668d982b0bb09fd6bf12c59b923f856e2 (patch)
treebc9ccc46dc7c6333d37d1f630c8e3a12298c008b
parent296ccc70eafbee2821a391fa281927403f707c94 (diff)
downloadmpv-d28a3ad668d982b0bb09fd6bf12c59b923f856e2.tar.bz2
mpv-d28a3ad668d982b0bb09fd6bf12c59b923f856e2.tar.xz
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 it is a trivial change". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27588 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale_template.c2
1 files changed, 1 insertions, 1 deletions
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;
}