mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
f4332e9591
* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56': lavc: use buf[0] instead of data[0] as the indicator of an allocated frame Conflicts: libavcodec/utils.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.