Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 09:59:16 +0000 (10:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Mar 2014 10:00:27 +0000 (11:00 +0100)
commita696b0917d1d1ef5b0dee691786ddb51ee4ab519
tree38e280db66df3544f774f26f9a54d9d587dd9220
parent2b570c9569a2c8858f5f5f198efcf7000cfc4738
parentfb5cf145b6bcfa4f83af94398e5560c1132cc410
Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'

* 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>
libavcodec/bmp_parser.c
libavcodec/version.h