mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-11-14 21:58:33 +03:00
* qatar/master: fate-jpeg2000-dcinema: force output to xyz12le Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master: fate-jpeg2000-dcinema: force output to xyz12le Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>