align more with ffmpeg master