Few FFmpeg changes