* commit '7ecc2d40':
  Move AVFrame from lavc to lavu.

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