Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 19:06:54 +0000 (21:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jun 2015 19:06:58 +0000 (21:06 +0200)
* commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d':
  TextureDSP: fix erroneous condition which produced blocky output for DXT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/texturedspenc.c

Simple merge