Commit 230aaffb authored by Christophe Mutricy's avatar Christophe Mutricy

Ressucitate the telx module and make it to conflict with the zvbi module

parent 21fec3ee
......@@ -3783,19 +3783,36 @@ if test "${enable_x264}" != "no"; then
fi
dnl
dnl Teletext Modules
dnl vbi decoder plugin (using libzbvi)
dnl telx module
dnl uncompatible
dnl
AC_ARG_ENABLE(zvbi,
[ --enable-zvbi VBI decoding support with libzvbi (default enabled)])
if test "${enable_zvbi}" != "no"; then
PKG_CHECK_MODULES(ZVBI,
zvbi-0.2 >= 0.2.25,
[
VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGINS([zvbi]) ],
[AC_MSG_WARN(ZVBI library not found)])
fi
[ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)])
AC_ARG_ENABLE(telx,
[ --enable-telx, Teletext decoding module (conflicting with zvbi) (default disabled)])
AS_IF( [test "${enable_zvbi}" != "no"],[
AS_IF( [test "${enable_telx}" = "yes"],[
AC_MSG_ERROR([The zvbi and telx modules are uncompatibles. Disable the other if you enable one.])
],[
PKG_CHECK_MODULES(ZVBI,
zvbi-0.2 >= 0.2.25,
[
VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGINS([zvbi])
AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built])
],[
AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
enable_telx="yes"
])
])
])
AS_IF( [test "${enable_telx}" = "yes"],[
VLC_ADD_PLUGINS([telx])
])
dnl
dnl CMML plugin
......
......@@ -13,11 +13,13 @@ SOURCES_speex = speex.c
SOURCES_adpcm = adpcm.c
SOURCES_mpeg_audio = mpeg_audio.c
SOURCES_libmpeg2 = libmpeg2.c
SOURCES_libvc1 = libvc1.c
SOURCES_rawvideo = rawvideo.c
SOURCES_quicktime = quicktime.c
SOURCES_subsdec = subsdec.c
SOURCES_faad = faad.c
SOURCES_dvbsub = dvbsub.c
SOURCES_telx = telx.c
SOURCES_mash = mash.cpp
SOURCES_x264 = x264.c
SOURCES_twolame = twolame.c
......
This diff is collapsed.
......@@ -1662,8 +1662,9 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
i_skip += 2;
}
else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
i_skip = 0;
#ifdef ZVBI_COMPILED
i_skip = 0; /*hack for zvbi support */
#endif
/* skip header */
while( p_pes && i_skip > 0 )
{
......
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