[FFmpeg-cvslog] Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 14:14:10 2014 +0100| [6b1ca1709fe5d66eef8292dc9f495cf3182517b4] | committer: Michael Niedermayer

Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'

* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
  RGBA64 pixel formats

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/utils.c

See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3
See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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