removed ffmpeg dependency from gpucodec module:

used implementation from highgui module
pull/1195/head
Vladislav Vinogradov 12 years ago
parent 8afb7a40c6
commit 60e2dbe810
  1. 2
      modules/gpucodec/CMakeLists.txt
  2. 4
      modules/gpucodec/src/ffmpeg_video_source.cpp
  3. 2
      modules/highgui/src/cap_ffmpeg_api.hpp

@ -11,7 +11,7 @@ ocv_add_module(gpucodec opencv_highgui)
ocv_module_include_directories()
ocv_glob_module_sources()
set(extra_libs ${HIGHGUI_LIBRARIES})
set(extra_libs "")
if(HAVE_NVCUVID)
list(APPEND extra_libs ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})

@ -45,10 +45,6 @@
#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::gpucodec;
using namespace cv::gpucodec::detail;

@ -8,6 +8,8 @@ extern "C"
#if defined WIN32 || defined _WIN32
# define OPENCV_FFMPEG_API __declspec(dllexport)
#elif defined __GNUC__ && __GNUC__ >= 4
# define OPENCV_FFMPEG_API __attribute__ ((visibility ("default")))
#else
# define OPENCV_FFMPEG_API
#endif

Loading…
Cancel
Save