Michael Niedermayer 8e85b69d71 Merge commit '8c65264595d5a82c56ae5043320e4b875a414229' ...

* commit '8c65264595d5a82c56ae5043320e4b875a414229':
  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>

2013-04-05 12:39:06 +02:00

3.6 KiB

Raw Blame History

View Raw