diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 12:52:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 12:52:23 +0200 |
| commit | 29a4221ad380e9d9ddd305ce9e9487edfaeac725 (patch) | |
| tree | e47db4b4bccbb53efd757f67e28ede943612e05a /libavformat/tty.c | |
| parent | 029cca6fb3ea545c27e825fc2f4dbe71553c0b56 (diff) | |
| parent | 28a807e28b4534326527df24ca7ae092ba0b15cd (diff) | |
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>
Diffstat (limited to 'libavformat/tty.c')
0 files changed, 0 insertions, 0 deletions