summaryrefslogtreecommitdiff
path: root/libavcodec/texturedspenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-24 21:06:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-24 21:06:58 +0200
commiteb823df817660947fe9c8172f01319c3b972b588 (patch)
tree4b67f8ba21290cf7b5c1d24bc48f995a097025eb /libavcodec/texturedspenc.c
parent87544ce8dcf9ed26ca3b5959407d0ba8c8ad5233 (diff)
parent5dbd491eb38efab1d1313d4129ed76ab2e98176d (diff)
Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'
* commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d': TextureDSP: fix erroneous condition which produced blocky output for DXT Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/texturedspenc.c')
-rw-r--r--libavcodec/texturedspenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c
index 577e1c43b8..5bd07771e7 100644
--- a/libavcodec/texturedspenc.c
+++ b/libavcodec/texturedspenc.c
@@ -363,7 +363,7 @@ static int refine_colors(const uint8_t *block, ptrdiff_t stride,
const int prods[4] = { 0x090000, 0x000900, 0x040102, 0x010402 };
/* Check if all pixels have the same index */
- if (mask ^ (mask << 2) < 4) {
+ if ((mask ^ (mask << 2)) < 4) {
/* If so, linear system would be singular; solve using optimal
* single-color match on average color. */
int r = 8, g = 8, b = 8;