* commit 'd63443b9':
  lavc: drop the av_fast_{re,m}alloc compatibility wrappers

Conflicts:
	libavcodec/utils.c

See: a973e015Merged-by: Michael Niedermayer <michaelni@gmx.at>