[FFmpeg-cvslog] Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 10:59:16 2014 +0100| [a696b0917d1d1ef5b0dee691786ddb51ee4ab519] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a696b0917d1d1ef5b0dee691786ddb51ee4ab519
---