Make rtp & codec actions thread-safe
Fixed conflicts
This might be causing problems
Merge branch 'mannol1-master'
Fixed bug when loading friends list already containing an added friend.
The width and height set during the video encoder initialization is
now described as the maximum width and height of images.

This is to work around what appears to be a bug in libvpx where the
resolution of the stream can be decreased but increasing it above
its originally set value introduces memory corruption.