1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
FFmpeg/libavutil
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
..
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-12-05 20:25:32 +01:00
2013-03-07 01:12:04 +01:00
2013-03-07 01:12:04 +01:00
2013-03-30 20:28:00 +01:00
2013-03-30 20:28:00 +01:00
2013-03-22 09:20:45 +01:00
2012-10-31 17:01:52 +01:00
2013-01-24 00:49:47 +01:00
2013-01-24 00:49:47 +01:00
2013-03-19 00:47:00 +01:00
2012-08-09 01:44:15 +02:00
2012-10-28 14:33:41 +01:00
2013-03-10 11:12:56 +01:00
2013-03-20 21:04:28 +01:00
2012-10-06 14:03:15 +02:00
2012-11-23 18:10:02 +01:00
2012-10-28 14:33:41 +01:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00
2013-01-05 16:25:37 +01:00