mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
ba7cdb970f
* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851': img2: add j2c file extension Conflicts: libavformat/img2enc.c See: e8df18270a50fd57eab06f1718ad9d075b200d98 Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.