More av cleanup
Merge branch 'mutex-1' of https://github.com/mannol/toxcore
Fixed bug where video didn't work anymore.

Some other cleanups.
Jbuff fixes.