3bfb7a2537
* commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97': vf_frei0r: fix missing end of line character Conflicts: libavfilter/vf_frei0r.c No change as the token parsing change was not merged 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.