Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 18:35:51 +0000 (20:35 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 18:35:59 +0000 (20:35 +0200)
commit8fe00dd18a4a10c3157b8fae41b5e864f0260951
tree4bee068886b11e61d7227afe980ec75b0017d627
parent2de5737ee21d99248265427fe9c211ae1d9196f6
parent6b2b26e7af3ede0abfb46eb5725c26d1083f50bc
Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'

* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
  dds: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dds.c