5fb652dddb
* commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93': oma: correctly mark and decrypt partial packets Conflicts: libavformat/omadec.c See: dcd013a535bccbb163b740b72bbedde67dc8e633 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.