* commit 'fb1ddcdc':
  avresample: Introduce AVFrame-based API

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