Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:28:59 +0000 (22:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:29:17 +0000 (22:29 +0100)
* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27def898e7499cf36b65b5debc4f303e7e5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge