Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 18:19:30 +0000 (20:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Apr 2014 18:53:34 +0000 (20:53 +0200)
commit0d225863f2c9855c6c39890da63f1fc6d6fb9391
tree9a81fa6a70befbcb9f7f036bccb7fc81638465c3
parent836b60ce2b497615432b90a33146e4547ee82586
parent17a75a8c0902a86a1e933312e562a40656e281e3
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>