-
Michael Niedermayer authored
* commit 'fb5cf145': bmp: add a standalone parser Conflicts: Changelog libavcodec/bmp_parser.c libavcodec/version.h See: 011ce89d and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
a696b091
* commit 'fb5cf145': bmp: add a standalone parser Conflicts: Changelog libavcodec/bmp_parser.c libavcodec/version.h See: 011ce89d and others Merged-by: Michael Niedermayer <michaelni@gmx.at>