Fix typo in version number
Re-sync FFmpeg to 2.2.6

To many merges to apply individual changes, so doing it as a big diff