Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:34:09 +0000 (14:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:34:09 +0000 (14:34 +0200)
commit72773203a64af0a66a4e37fa03bf8744116f517a
treee441fca6793e47ee0ca5bf38186838edaf25e2f1
parent8537e249276b36deecfee7cba52d40fdf044d630
parentd0f7e4a57fbffa0efb204d4274c3dd56fbfff946
Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'

* commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946':
  dxtory: Unify and rework the decoding routines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/dxtory.c