Update ffmpeg dependency in oraclejdk7
Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs

Update ffmpeg dependency to 0.10 in oraclejdk7