[FFmpeg-cvslog] Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 05:23:47 2015 +0100| [ada0fc4efa2502c901310faef6b63349e8b6bd6a] | committer: Michael Niedermayer

Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'

* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
  lavu: add planar 16 bit and 8 bit rgb with alpha

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

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

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