Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 04:23:47 +0000 (05:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 04:24:01 +0000 (05:24 +0100)
commitada0fc4efa2502c901310faef6b63349e8b6bd6a
tree491f57008a078c48f13071e71d51e9a0db6c111b
parent55dc253c24f2160ede1db4f04cfe0692b0b80d05
parent0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a
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@gmx.at>
libavutil/pixfmt.h
libavutil/version.h