mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer
0c67ef2729
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
* commit '86a0432688216562926d4aee36118f01be6d5e1b': Silicon Graphics Motion Video Compressor 1 & 2 decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/mvcdec.c libavcodec/version.h See: 746b1dcc98b466e4abd301f304127583722ad80b 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%