Merge commit '1b709f23fb5f505c834d4c855703225795def01d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 11:57:50 +0000 (13:57 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 11:57:50 +0000 (13:57 +0200)
commit8f80f3d074d8e9e5b20a7f7aa5010d387689edf3
tree007923b8572d6e7b98a3294b7097648538bdb2cb
parent6115966ad3473aff2309f19c4e27f279109efe3a
parent1b709f23fb5f505c834d4c855703225795def01d
Merge commit '1b709f23fb5f505c834d4c855703225795def01d'

* commit '1b709f23fb5f505c834d4c855703225795def01d':
  jpeg2000: Refactor decode_packets

Not merged, as the ffmpeg code is much more advanced.

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