ada9b17e7a3d63b5c58d493006d7b17aa2617813

* commit '8b524ab0c43c1767919530abb79d3656113cdc47': movenc: Add a warning message if conflicting options have been specified Conflicts: libavformat/movenc.c 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%