* commit '755cd4197d53946208e042f095b930dca18d9430': mov: enable parsing for VC-1. lavfi: Add fps filter. lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs. avconv: add support for audio in complex filtergraphs. Conflicts: ffmpeg.c libavfilter/version.h libavformat/mov.c tests/ref/fate/vc1-ism 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
90.6%
Assembly
7.5%
Makefile
1.3%
C++
0.2%
Objective-C
0.1%
Other
0.1%