- more ffmpeg2 fixes