* commit '77b2cd7b':
  AVFrame: add side data.

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