* commit '5b4797a2':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

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