diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:40:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:40:20 +0200 |
| commit | 7b67ce9ade01abcf0d5d08ada62011b43526a646 (patch) | |
| tree | 547d9cb282c65b9a7ff4e0abe4422e587a613be5 /tools/enum_options.c | |
| parent | 90a1c5e95c3f6bedcb97adb211e6e2b9de17d234 (diff) | |
| parent | 6598aaea1ad2cf82d40abb191ac26a5e4e5147ba (diff) | |
| download | ffmpeg-7b67ce9ade01abcf0d5d08ada62011b43526a646.tar.gz | |
Merge commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba' into release/2.2
* commit '6598aaea1ad2cf82d40abb191ac26a5e4e5147ba':
jpeg2000: enable 4 component pixel formats
See: f0358dc1d30cd4f4862489ab95c4d408b00a8b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions