Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 15:26:37 +0000 (17:26 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 15:26:37 +0000 (17:26 +0200)
commit05cf687d130a976d96051f6f6bdb63cf724d3709
tree876efe0baa8b03a560dcd611f6d0c72a0840cf85
parenteaf15bba03b4067cb56b704ebc2e0b36a501ef22
parent57214b2f7f9b1ccfd61e232e8989b5ee850f169c
Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'

* commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c':
  dds: Fix palette decoding

Conflicts:
libavcodec/dds.c

See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>