From ae88f9d8fb471e6cc5fee80316f0889aa07f830d Mon Sep 17 00:00:00 2001
From: Bay Dam <baydamd@gmail.com>
Date: Wed, 16 Mar 2016 22:18:57 +0100
Subject: [PATCH] Fix some name space conflicts

---
 VideoImpl.cpp | 1 +
 main.cpp      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VideoImpl.cpp b/VideoImpl.cpp
index 39381db..9483166 100644
--- a/VideoImpl.cpp
+++ b/VideoImpl.cpp
@@ -931,6 +931,7 @@ void VideoImpl::_freeCurrentSample() {
  */
 void VideoImpl::gstPadAddedCallback(GstElement *src, GstPad *newPad, VideoImpl* p)
 {
+  (void)src; //Unused
 #ifdef VIDEO_IMPL_VERBOSE
 #ifndef Q_OS_OSX
   // NOTE: This line was causing a problem on Mac OSX: it caused the software to freeze when loading a new movie.
diff --git a/main.cpp b/main.cpp
index ce222e0..1359b3b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -63,7 +63,7 @@ void initRegistry()
   // Shapes.
   registry.add<Quad>();
   registry.add<Mesh>();
-  registry.add<Ellipse>();
+  registry.add<MM_PREPEND_NAMESPACE(Ellipse)>();
   registry.add<Triangle>();
 }