* commit '1155fd02':
  frame: add a convenience function for copying AVFrame data

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