[FFmpeg-cvslog] Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 13 20:38:15 2015 +0200| [5d9873ecdab8d07c4f928d604a819756bb540e4b] | committer: Michael Niedermayer

Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'

* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
  quickdraw: Make the palette opaque

Conflicts:
	libavcodec/qdrw.c

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

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