Lock thread for ffmpeg/libav init

Conflicts:

	CHANGELOG