Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 10:26:39 +0000 (12:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 10:39:06 +0000 (12:39 +0200)
commit8e85b69d716b031cf7b01e5a22d79823c8d5aeca
treeee47d321f09f5bcccd46b47005e79f3dce5b42b6
parent495ed19b5bb0b3facb1833001dce4a4419e82800
parent8c65264595d5a82c56ae5043320e4b875a414229
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>
libavformat/img2.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h