Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 13:14:10 +0000 (14:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 13:41:13 +0000 (14:41 +0100)
commit6b1ca1709fe5d66eef8292dc9f495cf3182517b4
tree82954a93de58b1ba71733ba21a80cb5eaa64318c
parentad9a6e19e1a8abc0ce12ff85f9f3aaf321f16866
parent1481d24c3a0abf81e1d7a514547bd5305232be30
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@gmx.at>
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h