mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer
ba040d4c8c
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'
* commit '3828eb8519c1530392ab8820b1aa784602128afc': libfdk-aac: Relicense the library wrappers to 2-clause BSD Conflicts: libavcodec/libfdk-aacdec.c libavcodec/libfdk-aacenc.c <Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers <Daemon404> so it should be fine to merge. Thanks-to: Martin Storsjö <martin@martin.st> 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.
Languages
C
90.3%
Assembly
7.8%
Makefile
1.3%
C++
0.2%
Objective-C
0.2%
Other
0.1%