Commit 205a00a3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Simplify vorbis detection and activate encoder except when tremor is requested

parent c2cd93a6
......@@ -3447,43 +3447,7 @@ fi
dnl
dnl Vorbis plugin
dnl
AC_ARG_ENABLE(vorbis,
[ --enable-vorbis Vorbis decoder support (default enabled)])
if test "${enable_vorbis}" != "no"
then
AC_ARG_WITH(vorbis-tree,
[ --with-vorbis-tree=PATH vorbis tree for static linking])
if test -n "${with_vorbis_tree}"
then
AC_MSG_CHECKING(for libvorbis.a in ${with_vorbis_tree})
real_vorbis_tree="`cd ${with_vorbis_tree} 2>/dev/null && pwd`"
if test -z "${real_vorbis_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_vorbis_tree}])
fi
if test -f "${real_vorbis_tree}/lib/.libs/libvorbis.a"
then
dnl Use a custom vorbis
AC_MSG_RESULT(${real_vorbis_tree}/lib/.libs/libvorbis.a)
VLC_ADD_PLUGIN([vorbis])
VLC_ADD_LIBS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a])
VLC_ADD_CFLAGS([vorbis],[-I${real_vorbis_tree}/include])
else
dnl The given vorbis wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_vorbis_tree}/lib/.libs/libvorbis.a, make sure you compiled vorbis in ${with_vorbis_tree}])
fi
else
AC_CHECK_HEADERS(vorbis/codec.h, [
VLC_ADD_PLUGIN([vorbis])
VLC_ADD_LIBS([vorbis],[-lvorbis -logg -lm]) ],[])
AC_CHECK_HEADERS(vorbis/vorbisenc.h, [
VLC_ADD_LIBS([vorbis],[-lvorbisenc -lm]) ],[])
fi
fi
PKG_ENABLE_MODULES_VLC([VORBIS], [vorbis >= 1.1 vorbisenc >= 1.1], [Vorbis decoder and encoder], [auto])
dnl
dnl Tremor plugin
......
......@@ -44,15 +44,11 @@
#include <tremor/ivorbiscodec.h>
#else
#include <vorbis/codec.h>
/* vorbis header */
#ifdef HAVE_VORBIS_VORBISENC_H
# include <vorbis/vorbisenc.h>
# ifndef OV_ECTL_RATEMANAGE_AVG
# define OV_ECTL_RATEMANAGE_AVG 0x0
# endif
#endif
#include <vorbis/vorbisenc.h>
# ifndef OV_ECTL_RATEMANAGE_AVG
# define OV_ECTL_RATEMANAGE_AVG 0x0
# endif
#endif
......@@ -198,9 +194,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_("Vorbis audio encoder") )
set_capability( "encoder", 100 )
#if defined(HAVE_VORBIS_VORBISENC_H)
set_callbacks( OpenEncoder, CloseEncoder )
#endif
add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
ENC_QUALITY_LONGTEXT, false )
......@@ -748,7 +742,7 @@ static void CloseDecoder( vlc_object_t *p_this )
free( p_sys );
}
#if defined(HAVE_VORBIS_VORBISENC_H) && !defined(MODULE_NAME_IS_tremor)
#ifndef MODULE_NAME_IS_tremor
/*****************************************************************************
* encoder_sys_t : vorbis encoder descriptor
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment