Commit 4aa48e46 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'fb0a988f'

* commit 'fb0a988f':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27deMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0cf6b3b5 fb0a988f
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment