FFmpeg/libavcodec
Michael Niedermayer 296e63efa5 Merge commit '678082b409aca711f9cf991df6b0200116489322'
* commit '678082b409aca711f9cf991df6b0200116489322':
  X-Bitmap decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavcodec/xbmdec.c

See: a0340dfbd78df7639715056937011d2d414aaeed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:26:24 +01:00
..
2014-03-27 23:59:13 +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-27 23:59:13 +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-27 23:57:51 +01:00