Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c4e1edbb
Commit
c4e1edbb
authored
Jul 30, 2013
by
Andrey Pavlenko
Committed by
OpenCV Buildbot
Jul 30, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
parents
93923141
60e2dbe8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
CMakeLists.txt
modules/gpucodec/CMakeLists.txt
+1
-1
ffmpeg_video_source.cpp
modules/gpucodec/src/ffmpeg_video_source.cpp
+0
-4
cap_ffmpeg_api.hpp
modules/highgui/src/cap_ffmpeg_api.hpp
+4
-2
No files found.
modules/gpucodec/CMakeLists.txt
View file @
c4e1edbb
...
...
@@ -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
}
)
...
...
modules/gpucodec/src/ffmpeg_video_source.cpp
View file @
c4e1edbb
...
...
@@ -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
;
...
...
modules/highgui/src/cap_ffmpeg_api.hpp
View file @
c4e1edbb
...
...
@@ -7,9 +7,11 @@ extern "C"
#endif
#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
#define OPENCV_FFMPEG_API
#
define OPENCV_FFMPEG_API
#endif
enum
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment