mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
5b23c7ed6f
* commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941': g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO Conflicts: libavcodec/g2meet.c See: cb2162adba4041951c987f9f365957e067b28a97 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.