mirror of
https://github.com/opencv/opencv.git
synced 2025-06-11 19:59:08 +08:00
fixed static build of gpu module with ffmpeg:
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
This commit is contained in:
parent
beb377b38c
commit
bff818afbd
@ -44,7 +44,7 @@
|
||||
|
||||
#if defined(HAVE_CUDA) && !defined(__APPLE__)
|
||||
|
||||
#ifdef HAVE_FFMPEG
|
||||
#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS)
|
||||
#include "cap_ffmpeg_impl.hpp"
|
||||
#else
|
||||
#include "cap_ffmpeg_api.hpp"
|
||||
|
Loading…
Reference in New Issue
Block a user