fixed time scaling
ffmpeg support
Fix incorrect merge
Merge git://github.com/stsydow/Logstalgia

Conflicts:
	src/logstalgia.cpp
	src/main.cpp