Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
ea337a8a
Commit
ea337a8a
authored
Mar 07, 2010
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Symplify configure.ac regarding OpenCV and rename the example file from C++ to C (that's a C file).
parent
e7bff62a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
40 deletions
+2
-40
configure.ac
configure.ac
+1
-39
modules/video_filter/Modules.am
modules/video_filter/Modules.am
+1
-1
modules/video_filter/opencv_example.c
modules/video_filter/opencv_example.c
+0
-0
No files found.
configure.ac
View file @
ea337a8a
...
...
@@ -1989,45 +1989,7 @@ fi
dnl
dnl OpenCV wrapper and example filters
dnl
AC_ARG_ENABLE(opencv,
[ --enable-opencv OpenCV (computer vision) filter (default disabled)])
if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
then
AC_ARG_WITH(opencv-tree,
[ --with-opencv-tree=PATH opencv tree for linking])
if test "${SYS}" = "mingw32"
then
test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
AC_MSG_CHECKING(for opencv in ${with_opencv_tree})
if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \
-a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h
then
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([opencv_wrapper])
VLC_ADD_LIBS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
AC_LANG_PUSH(C++)
VLC_ADD_PLUGIN([opencv_example])
VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui])
VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui])
AC_LANG_POP(C++)
else
dnl No opencv could be found, sorry
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
fi
else
PKG_CHECK_MODULES(OPENCV, opencv,
[
VLC_ADD_PLUGIN([opencv_example opencv_wrapper])
VLC_ADD_LIBS([opencv_example opencv_wrapper],[${OPENCV_LIBS}])
VLC_ADD_CFLAGS([opencv_wrapper],[${OPENCV_CFLAGS}])
VLC_ADD_CXXFLAGS([opencv_example],[${OPENCV_CFLAGS}])
],
[AC_MSG_ERROR([libopencv not found!])]
)
fi
fi
PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off])
dnl
...
...
modules/video_filter/Modules.am
View file @
ea337a8a
...
...
@@ -27,7 +27,7 @@ SOURCES_gradient = gradient.c
SOURCES_ball = ball.c
SOURCES_panoramix = panoramix.c
SOURCES_opencv_wrapper = opencv_wrapper.c
SOURCES_opencv_example = opencv_example.c
pp
filter_event_info.h
SOURCES_opencv_example = opencv_example.c filter_event_info.h
SOURCES_rotate = rotate.c
SOURCES_noise = noise.c
SOURCES_puzzle = puzzle.c
...
...
modules/video_filter/opencv_example.c
pp
→
modules/video_filter/opencv_example.c
View file @
ea337a8a
File moved
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