mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer
e664f48b97
Merge commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a'
* commit 'bdd1567c355a8092e7746ef99e831d579e34fa6a': lavc: remove disabled FF_API_CODEC_ID cruft Conflicts: libavcodec/old_codec_ids.h libavcodec/version.h Only the #define is removed The CODEC_IDs itself are left until theres some reason to remove them. 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%