Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
3c229fd0
Commit
3c229fd0
authored
Nov 24, 2015
by
Ghislain MARY
Browse files
Fix build without vpx.
parent
d289c123
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
3c229fd0
...
...
@@ -278,7 +278,9 @@ endif()
# TODO: Handle Theora option
if
(
ENABLE_VPX
)
find_package
(
VPX
)
if
(
NOT VPX_FOUND
)
if
(
VPX_FOUND
)
set
(
HAVE_VPX 1
)
else
()
set
(
ENABLE_VPX OFF CACHE BOOL
"Build mediastreamer2 with VPX codec."
FORCE
)
endif
()
endif
()
...
...
configure.ac
View file @
3c229fd0
...
...
@@ -764,6 +764,10 @@ AM_CONDITIONAL(BUILD_X11_XV, test "$enable_xv" = "true" )
AM_CONDITIONAL(BUILD_X11_GL, test "$enable_glx" = "true" )
AM_CONDITIONAL(BUILD_UPNP, test "$build_upnp" = "true" )
if test "$build_vp8" != "false" ; then
AC_DEFINE(HAVE_VPX, 1, [Tells whether vpx can be used])
fi
dnl *********************************************
dnl Enable/disable oRTP dependency
dnl *********************************************
...
...
mediastreamer-config.h.cmake
View file @
3c229fd0
...
...
@@ -68,3 +68,4 @@
#cmakedefine HAVE_POLARSSL_SSL_H 1
#cmakedefine HAVE_PCAP 1
#cmakedefine HAVE_MATROSKA 1
#cmakedefine HAVE_VPX 1
src/videofilters/mkv.c
View file @
3c229fd0
...
...
@@ -427,6 +427,9 @@ static const ModuleDesc h264_module_desc = {
/*********************************************************************************************
* VP8 module *
*********************************************************************************************/
#ifdef HAVE_VPX
typedef
struct
_Vp8Module
{
Vp8RtpFmtUnpackerCtx
unpacker
;
Vp8RtpFmtPackerCtx
packer
;
...
...
@@ -522,6 +525,8 @@ static const ModuleDesc vp8_module_desc = {
};
#endif
#endif
/* HAVE_VPX */
/*********************************************************************************************
* µLaw module *
*********************************************************************************************/
...
...
@@ -722,7 +727,9 @@ typedef enum {
static
const
ModuleDesc
*
moduleDescs
[]
=
{
&
h264_module_desc
,
#ifdef HAVE_VPX
&
vp8_module_desc
,
#endif
/* HAVE_VPX */
&
mu_law_module_desc
,
&
opus_module_desc
,
NULL
...
...
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