bb40f8f5e2
* commit '2c5e1d0933facc20c6926a788cce05d3e6cad149': configure: Use the right pkgconf file for openjpeg Conflicts: configure No change as the incorrect code wasnt in ffmpegs configure 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.