29707f5ba6
* commit 'a925f723a915bc0255e2673f8817af5212131763': rtp: Don't read priv_data unless it is allocated flvenc: Check whether seeking back to the header succeeded sapenc: Pass the title on to the chained muxers Conflicts: libavformat/flvenc.c libavformat/sapenc.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.