Commit fa804348 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Removed telx Teletext decoder in favor of zvbi based Teletext decoder.

parent e1befdbd
...@@ -3791,6 +3791,8 @@ if test "${enable_zvbi}" != "no"; then ...@@ -3791,6 +3791,8 @@ if test "${enable_zvbi}" != "no"; then
PKG_CHECK_MODULES(ZVBI, PKG_CHECK_MODULES(ZVBI,
zvbi-0.2 >= 0.2.25, zvbi-0.2 >= 0.2.25,
[ [
AC_DEFINE(HAVE_ZVBI_H, 1,
Define if Teletext decoder based on zvbi lib is used.)
VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS]) VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
VLC_ADD_PLUGINS([zvbi]) ], VLC_ADD_PLUGINS([zvbi]) ],
......
...@@ -18,7 +18,6 @@ SOURCES_quicktime = quicktime.c ...@@ -18,7 +18,6 @@ SOURCES_quicktime = quicktime.c
SOURCES_subsdec = subsdec.c SOURCES_subsdec = subsdec.c
SOURCES_faad = faad.c SOURCES_faad = faad.c
SOURCES_dvbsub = dvbsub.c SOURCES_dvbsub = dvbsub.c
SOURCES_telx = telx.c
SOURCES_mash = mash.cpp SOURCES_mash = mash.cpp
SOURCES_x264 = x264.c SOURCES_x264 = x264.c
SOURCES_twolame = twolame.c SOURCES_twolame = twolame.c
......
This diff is collapsed.
...@@ -1662,7 +1662,7 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) ...@@ -1662,7 +1662,7 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
i_skip += 2; i_skip += 2;
} }
else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) ) else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
i_skip = 0; /* FIXME hack for zvbi support, breaks telx decoder */ i_skip = 0;
/* skip header */ /* skip header */
while( p_pes && i_skip > 0 ) 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