VLC media player 2.2.1 'Terry Pratchett'

This is the first fixed up release of the 'Weatherwax' branch of VLC

This fixes numerous crashes, and fixes regressions from 2.1.x