Video multicast is an important application for P2P networks, which can benefit from the load repartitioning and large scale distribution properties they offer. In this context, the Orchard algorithm was developed in 2007, with an aim to build a P2P system meeting video multicast requirements. However, Orchard suffers from a slow overlay construction and a potentially high end-to-end delay. In this work, we propose a new algorithm that we call Cedar. Based on Orchard, it integrates original functionalities to speed-up the tree construction and builds a topologically-aware overlay network in order to minimize end-to-end delay. Simulation results showed that Cedar fulfilled its requirements, as the tree construction speed was increased by at least 64%, and the end-to-end delays reduced from around 20 seconds to a maximum of 5 seconds. The Network Awareness functionality also reduced end-to-end delays by 33%.