Merged changes from omxplayer and updated to new ffmpeg. Working with last wheezy image.