aed58f6aae
* commit '92e354b655613b88c3c202a7e19e7037daed37eb': rtpdec_vp8: Set the timestamp when returning a deferred packet hlsenc: Make the start_number option set the right variable 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.