Michael Niedermayer
0c402810fa
* commit '2e708f17083fc41f10161f2406d57ec154c75468': ljpeg: fix duplicated pixel format entry Conflicts: libavcodec/ljpegenc.c No change as there was no duplicate entry in ffmpeg 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.