Commit c4e1edbb authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by OpenCV Buildbot

Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep

parents 93923141 60e2dbe8
...@@ -11,7 +11,7 @@ ocv_add_module(gpucodec opencv_highgui) ...@@ -11,7 +11,7 @@ ocv_add_module(gpucodec opencv_highgui)
ocv_module_include_directories() ocv_module_include_directories()
ocv_glob_module_sources() ocv_glob_module_sources()
set(extra_libs ${HIGHGUI_LIBRARIES}) set(extra_libs "")
if(HAVE_NVCUVID) if(HAVE_NVCUVID)
list(APPEND extra_libs ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY}) list(APPEND extra_libs ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})
......
...@@ -45,10 +45,6 @@ ...@@ -45,10 +45,6 @@
#ifdef HAVE_NVCUVID #ifdef HAVE_NVCUVID
#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS) && !defined(WIN32)
#include "../src/cap_ffmpeg_impl.hpp"
#endif
using namespace cv; using namespace cv;
using namespace cv::gpucodec; using namespace cv::gpucodec;
using namespace cv::gpucodec::detail; using namespace cv::gpucodec::detail;
......
...@@ -7,9 +7,11 @@ extern "C" ...@@ -7,9 +7,11 @@ extern "C"
#endif #endif
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
#define OPENCV_FFMPEG_API __declspec(dllexport) # define OPENCV_FFMPEG_API __declspec(dllexport)
#elif defined __GNUC__ && __GNUC__ >= 4
# define OPENCV_FFMPEG_API __attribute__ ((visibility ("default")))
#else #else
#define OPENCV_FFMPEG_API # define OPENCV_FFMPEG_API
#endif #endif
enum enum
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment