Add simpler method to run ffmpeg
Merge remote-tracking branch 'origin/hls' into hls

Conflicts:
	src/hlstream/streams.go
Add workaround for buffer overrun