diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:33:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:35:07 +0200 |
| commit | 9276467bcec5deaa5a3cfa3a064d8f85fcb4099c (patch) | |
| tree | 77b647c665357fe227a8164a0d579965508b9e90 /libavcodec | |
| parent | fe5b0895966382402e8fb17f63dfe8117c8915ec (diff) | |
| parent | 851465f9d9edaa1c233ed72f2a510119d0151928 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate-jpeg2000-dcinema: force output to xyz12le
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions