Source tree reorganisation and inclusion of the required ffmpeg sources