[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Fri Apr 5 13:00:43 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 5 12:52:23 2013 +0200| [29a4221ad380e9d9ddd305ce9e9487edfaeac725] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29a4221ad380e9d9ddd305ce9e9487edfaeac725
---
More information about the ffmpeg-cvslog
mailing list