1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'

* commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d':
  TextureDSP: fix erroneous condition which produced blocky output for DXT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-24 21:06:54 +02:00
commit eb823df817

View File

@ -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;