* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a': lavu: add planar 16 bit and 8 bit rgb with alpha Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h See: e6d4e68755 Merged-by: Michael Niedermayer <michaelni@gmx.at>
e6d4e68755