From 35ac3f9c6773e95284760fa41a2d3466eeae3e96 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 25 Jan 2019 19:15:47 +0100
Subject: [PATCH] [bob-devel] Revert most changes, try opencv-3.4.1

---
 conda/bob-devel/meta.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml
index 05d24ded..7328d958 100644
--- a/conda/bob-devel/meta.yaml
+++ b/conda/bob-devel/meta.yaml
@@ -31,7 +31,7 @@ requirements:
     - cyvlfeat 0.4.6
     - dlib 19.7
     - docopt 0.6.2
-    - ffmpeg 4.0
+    - ffmpeg 3.4
     - freetype 2.9.1
     - giflib 5.1.4
     - hdf5 1.10.1
@@ -52,8 +52,8 @@ requirements:
     - mne 0.15.2
     - mr.developer 1.38
     - nose 1.3.7
-    - numpy 1.15.4
-    - opencv 3.4.2
+    - numpy 1.15.1
+    - opencv 3.4.1
     - pillow 5.2.0
     - pkg-config 0.29.2
     - pyedflib 0.1.11
-- 
GitLab