diff --git a/Makefile.in b/Makefile.in
index 0f80a2186..cf0982a15 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,7 +151,6 @@ OBJS	      = @OBJS@ \
 		src/video_display/null.o \
 		src/video_display/pipe.o \
 		src/video_display/proxy.o \
-		src/video_display/conference.o \
 		src/video_export.o \
 		src/video_rxtx.o \
 		src/video_rxtx/ihdtv.o \
diff --git a/configure.ac b/configure.ac
index db6f93b21..d93c1913b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2622,6 +2622,35 @@ then
         syphon=yes
 fi
 
+# -------------------------------------------------------------------------------------------------
+# MCU-like video mixer
+# -------------------------------------------------------------------------------------------------
+video_mix=no
+
+define(video_mix_dep, opencv)
+
+AC_ARG_ENABLE(video-mixer,
+[  --disable-video-mixer   disable MCU-like video mixer (default is auto)]
+[                          Requires: video_mix_dep],
+    [video_mix_req=$enableval],
+    [video_mix_req=auto]
+    )
+
+PKG_CHECK_MODULES([VIDEO_MIX], [video_mix_dep], FOUND_VIDEO_MIX_DEP=yes, FOUND_VIDEO_MIX_DEP=no)
+
+if test $video_mix_req != no -a $FOUND_VIDEO_MIX_DEP = yes
+then
+        CFLAGS="$CFLAGS ${VIDEO_MIX_CFLAGS}"
+        CXXFLAGS="$CXXFLAGS ${VIDEO_MIX_CFLAGS}"
+        VIDEO_MIX_OBJ="src/video_display/conference.o"
+        ADD_MODULE("display_video_mix", "$VIDEO_MIX_OBJ", "$VIDEO_MIX_LIBS")
+        video_mix=yes
+fi
+
+if test $video_mix_req = yes -a $video_mix = no; then
+        AC_MSG_ERROR([Could not found OpenCV needed for video mixer!]);
+fi
+
 # -------------------------------------------------------------------------------------------------
 # We need to add libraries then
 # -------------------------------------------------------------------------------------------------
@@ -2699,6 +2728,7 @@ RESULT=\
   scale postprocessor ......... $scale
   testcard extras ............. $testcard_extras_req
   GPU accelerated LDGM ........ $ldgm_gpu
+  MCU-like video mixer ........ $video_mix
   "
 
 AC_MSG_RESULT(