update for 2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>