mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-14 22:22:59 +02:00
6732f4350d
* commit '38893dc028e458eaf3f906833d4ee515689edb7e': pcmdec: replace a reachable assert with an error check Conflicts: libavformat/pcmdec.c No assert removed as there was none in FFmpeg in the equivalent function 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.