From 0cbc8ae150b90bcb709879174e1f0973d3841663 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Wed, 3 Jun 2020 21:49:38 +0200
Subject: [PATCH] [windows] don't disable ffmpeg default features
---
windows-1809/cuda-devel/Dockerfile | 2 +-
windows-1809/devel/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/windows-1809/cuda-devel/Dockerfile b/windows-1809/cuda-devel/Dockerfile
index cc49b57..db103f1 100644
--- a/windows-1809/cuda-devel/Dockerfile
+++ b/windows-1809/cuda-devel/Dockerfile
@@ -16,7 +16,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
RUN cd $env:VCPKG_DIR; \
./vcpkg install --triplet "$env:VCPKG_TARGET_TRIPLET" \
- "\"ffmpeg[nvcodec,avresample,core]\"" \
+ "\"ffmpeg[nvcodec,avresample]\"" \
"\"opencv4[cuda,ffmpeg,ximea,opengl,contrib,ipp,dnn]\""; \
Remove-Item -Force -Recurse ./downloads; \
Remove-Item -Force -Recurse ./buildtrees; \
diff --git a/windows-1809/devel/Dockerfile b/windows-1809/devel/Dockerfile
index de30942..08992b4 100644
--- a/windows-1809/devel/Dockerfile
+++ b/windows-1809/devel/Dockerfile
@@ -6,7 +6,7 @@ LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
RUN cd $env:VCPKG_DIR; \
./vcpkg install --triplet "$env:VCPKG_TARGET_TRIPLET" \
- "\"ffmpeg[avresample,core]\"" \
+ "\"ffmpeg[avresample]\"" \
"\"opencv4[ffmpeg,ximea,opengl,contrib,ipp,dnn]\""; \
Remove-Item -Force -Recurse ./downloads; \
Remove-Item -Force -Recurse ./buildtrees; \
--
GitLab