* commit '5e2ba41d':
  build: add avresample after avcodec to FFLIBS

Conflicts:
	Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>