* commit 'e9abafca':
  avutil: add AV_PIX_FMT_YA16 pixel format

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>