[FFmpeg-cvslog] Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 14:34:09 2015 +0200| [72773203a64af0a66a4e37fa03bf8744116f517a] | committer: Hendrik Leppkes

Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72773203a64af0a66a4e37fa03bf8744116f517a
---