Now supports ffmpeg 2.4.2