Small changes to work ffmpeg-2