* commit '34efb8a1':
  quickdraw: Support direct pixel blocks

Conflicts:
	Changelog
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>