Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libxvid: fix missing end of line character

Conflicts:
	libavcodec/libxvid.c

No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently
Merged-by: Michael Niedermayer <michaelni@gmx.at>