FFmpeg/libavcodec
Michael Niedermayer a696b0917d 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>
2014-03-28 11:00:27 +01:00
..
2014-03-28 00:08:24 +01:00
2014-03-22 03:12:18 +01:00
2014-03-25 13:29:05 +01:00
2014-03-26 04:20:52 +01:00
2014-03-28 00:08:24 +01:00
2014-03-16 23:29:51 +01:00
2014-03-16 23:31:29 +01:00
2014-03-25 13:29:05 +01:00
2014-03-25 13:29:05 +01:00
2014-03-28 05:34:25 +01:00
2014-03-27 23:57:51 +01:00