mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'
* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105': riff: IPJ2 decodes with JPEG2000 decoder See: b18c27def898e7499cf36b65b5debc4f303e7e5b Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4aa48e467b