mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
5692ad00f4
* commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753': lavfi: fix compatibility code for old vf_scale options syntax Conflicts: libavfilter/avfilter.c No change as the buggy code does not exist in FFmpeg 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.