* commit 'cce3e0a4':
  Move av_fast_{m,re}alloc from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavutil/mem.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>