Lift in FFMPEGStreamHandler from psobot's code
Merge pull request #23 from Rosuav/lift_in_ffmpeg_stream_handler

Lift in FFMPEGStreamHandler from psobot's code