[FFmpeg-cvslog] Merge commit '4d8c28deab2488579f585406110b1be790896e59'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 27 02:26:45 2014 +0200| [e222cfefcdcb496e47391b53f0391e9c3cb66397] | committer: Michael Niedermayer

Merge commit '4d8c28deab2488579f585406110b1be790896e59'

* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
	libavutil/imgutils.c

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

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