Merge commit '8c652645'
* commit '8c652645': pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values img2: Add j2k file extension for JPEG 2000 Conflicts: libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment