up to date with upstream-ffmpeg