mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'
* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
riff: IPJ2 decodes with JPEG2000 decoder
See: b18c27def8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4aa48e467b