[vlc-devel] commit: telx: ignore initial page 100 (Derk-Jan Hartman )

[git version control]

vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Thu Sep 11 03:00:02 2008 +0200| [1bc0649628075569c7b6be7c6361c7d88b7005fe] | committer: Derk-Jan Hartman 

telx: ignore initial page 100

If the TS demux signals initial page 100, then this inital page is likely NOT the subtitle page. Since we can only really handle subtitles, let the teletext decoder figure out which pages are subtitles on its own.

Per request of Marian Durkovic

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1bc0649628075569c7b6be7c6361c7d88b7005fe
---

 modules/codec/telx.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index 18f4d90..ebcd446 100644
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -195,7 +195,8 @@ static int Open( vlc_object_t *p_this )
     var_Create( p_dec, "telx-override-page",
                 VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Get( p_dec, "telx-override-page", &val );
-    if( val.i_int == -1 && p_dec->fmt_in.subs.dvb.i_id != -1 )
+    if( val.i_int == -1 && p_dec->fmt_in.subs.dvb.i_id != -1 
+          && p_dec->fmt_in.subs.dvb.i_id != (1<<16) ) /* ignore if TS demux wants page 100 (unlikely to be sub) */
     {
         p_sys->i_wanted_magazine = p_dec->fmt_in.subs.dvb.i_id >> 16;
         if( p_sys->i_wanted_magazine == 0 )