a696b0917d
* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410': bmp: add a standalone parser Conflicts: Changelog libavcodec/bmp_parser.c libavcodec/version.h See: 011ce89dba5c0c764abc5f39acb6368f580742e3 and others 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.