Changes to add FFmpeg support