[FFmpeg-cvslog] Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'

Michael Niedermayer git at videolan.org
Fri Apr 5 12:46:03 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  5 12:26:39 2013 +0200| [8e85b69d716b031cf7b01e5a22d79823c8d5aeca] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e85b69d716b031cf7b01e5a22d79823c8d5aeca
---





More information about the ffmpeg-cvslog mailing list