mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer
f955fdc7c6
Merge remote-tracking branch 'qatar/master'
* qatar/master: cmdutils: Rename read_file to cmdutils_read_file Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
…
…
…
…
…
…
…
…
…
…
…
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory. 2) Licensing ------------ * See the LICENSE file.
Languages
C
90.3%
Assembly
7.8%
Makefile
1.3%
C++
0.2%
Objective-C
0.2%
Other
0.1%