[FFmpeg-cvslog] Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 20:40:26 2015 +0200| [39e89f521159474a854927840e5a8cc4350ee587] | committer: Michael Niedermayer

Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'

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

Conflicts:
	Changelog
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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