Backport latest FFmpeg2.2.6/2.3.1 from master
Updatye changelog and bump ver.to 6.12.0