Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:27:05 +0000 (14:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:27:05 +0000 (14:27 +0200)
commitaa15e233c4cf8ac64ec73445675aa72baeae661f
tree5cfa8a1f17ff256d189f4afe08c7798703dbddb3
parent696634c5fa5894b4adeb240191a723ec77a30756
parenta7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be
Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'

* commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be':
  dxtory: Factorize the buffer loading

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