Michael Niedermayer 29a4221ad3 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Conflicts:
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-04-05 12:52:23 +02:00

14 KiB

Raw Blame History

View Raw