Michael Niedermayer a696b0917d Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410' ...

* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410':
  bmp: add a standalone parser

Conflicts:
	Changelog
	libavcodec/bmp_parser.c
	libavcodec/version.h

See: 011ce89dba and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-28 11:00:27 +01:00

2.6 KiB

Raw Blame History

View Raw