3b8299c1e1
* commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558': flac muxer: add option to disable writing the global header Conflicts: libavformat/version.h 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.