c36fd16aaa0bf67b2af254ef8324dc8d8ee9fca7

* commit '82cebc0e0544dce507749dd9b1c2983f083de836': matroskadec: read the CodecDelay element Conflicts: libavformat/matroska.h 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.
Description
Languages
C
92.1%
Assembly
6%
Makefile
1.2%
C++
0.3%
Objective-C
0.2%
Other
0.1%