ffmpeg: merge from upstream