Merged changes from omxplayer until a4ee074. ffmpeg current version is now 2.5. Tested on Qt 5.4.0.