]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 10:52:23 +0000 (12:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 10:52:23 +0000 (12:52 +0200)
commit29a4221ad380e9d9ddd305ce9e9487edfaeac725
treee47db4b4bccbb53efd757f67e28ede943612e05a
parent029cca6fb3ea545c27e825fc2f4dbe71553c0b56
parent28a807e28b4534326527df24ca7ae092ba0b15cd
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>
libavcodec/libopenjpegdec.c