Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
87
Issues
87
List
Boards
Labels
Milestones
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
3873e718
Commit
3873e718
authored
Sep 22, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix daemon video tests
parent
13724c4f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
daemon/globals.mak
daemon/globals.mak
+1
-1
daemon/src/video/Makefile.am
daemon/src/video/Makefile.am
+1
-1
daemon/src/video/test/Makefile.am
daemon/src/video/test/Makefile.am
+2
-0
No files found.
daemon/globals.mak
View file @
3873e718
...
...
@@ -2,7 +2,7 @@
#CXXFLAGS=-Wall -Werror -Wextra
src
=
$(top_srcdir)
src
=
$(
abs_
top_srcdir)
sfllibdir
=
$(DESTDIR)$(libdir)
/sflphone
sflcodecdir
=
$(sfllibdir)
/codecs
sflplugindir
=
$(sfllibdir)
/plugins
...
...
daemon/src/video/Makefile.am
View file @
3873e718
...
...
@@ -21,4 +21,4 @@ ffmpeg2rtp_SOURCES=ffmpeg2rtp.cpp -I .
ffmpeg2rtp_LDADD
=
@LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ libvideo.la
$(top_builddir)
/src/libsflphone.la @CCRTP_LIBS@
ffmpeg2shm_SOURCES
=
ffmpeg2shm.c
ffmpeg2shm_LDADD
=
@LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@
ffmpeg2shm_LDADD
=
@LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@
@LIBAVUTIL_LIBS@
daemon/src/video/test/Makefile.am
View file @
3873e718
include
../../../globals.mak
TESTS
=
test_video_endpoint test_thread test_v4l2
check_PROGRAMS
=
test_video_endpoint test_video_rtp test_thread test_video_preview test_v4l2
...
...
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