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)
commiteb823df817660947fe9c8172f01319c3b972b588
tree4b67f8ba21290cf7b5c1d24bc48f995a097025eb
parent87544ce8dcf9ed26ca3b5959407d0ba8c8ad5233
parent5dbd491eb38efab1d1313d4129ed76ab2e98176d
Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'

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

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