8617be28d0
* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6': pcx: round up in bits->bytes conversion in a buffer size check Conflicts: libavcodec/pcx.c See: 6462268e74fa2c935c2936904cc1da9f499c04f3 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.