5b4c8aac97863b4830717db6cb2cd4e3093f9a88

* commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5': hls: Factor the sequence computation Conflicts: libavformat/hlsenc.c 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
92.1%
Assembly
6%
Makefile
1.2%
C++
0.3%
Objective-C
0.2%
Other
0.1%