Make telx and zvbi module mutual exclusive.

configure.ac

@@ -25,7 +25,7 @@ dnl automake behavior, you've likely never heard of maintainer mode, so we
 dnl can't expect you to enable it manually.
 
 AS_IF([test "x${enable_maintainer_mode}" != "xno"],
-	[enable_maintainer_mode="yes"])
+    [enable_maintainer_mode="yes"])
 
 dnl HA! HA!
 AM_MAINTAINER_MODE
@@ -1092,7 +1092,7 @@ dnl  default modules
 dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac tta])
-VLC_ADD_PLUGINS([cvdsub svcdsub spudec telx subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec])
+VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec])
 VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur rv32])
 VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32 mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
@@ -3451,19 +3451,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,
+  [  --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_MSG_WARN(ZVBI library not found)])
-fi
+          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

modules/demux/ts.c

@@ -1674,9 +1674,10 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
         /* */
         i_skip += 2;
     }
+#ifdef ZVBI_COMPILED
     else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
         i_skip = 0; /* FIXME temporary hack for zvbi support */
-
+#endif
     /* skip header */
     while( p_pes && i_skip > 0 )
     {