[vlc-devel] commit: Do not ignore teletext initial page (close #1997). (Laurent Aimar )

git version control git at videolan.org
Sun Sep 7 23:23:09 CEST 2008


vlc | branch: 0.9-bugfix | Laurent Aimar <fenrir at videolan.org> | Sat Sep  6 01:12:38 2008 +0200| [0166fd2de4a5bb93b58a36e8bab713f070264418] | committer: Derk-Jan Hartman 

Do not ignore teletext initial page (close #1997).

Be carefull, it adds a new translated strings.
(cherry picked from commit 664fb723687c9d6bddd5ff09cb9e96a4fddb42df)

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

 modules/demux/ts.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 528675f..dd8100a 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -3377,8 +3377,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
                         for( n = 0; n < sub->i_pages_number; n++ )
                         {
                             dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
-                            if( (p_page->i_teletext_type == 0x2)
-                                 || (p_page->i_teletext_type == 0x5) )
+                            if( p_page->i_teletext_type == 0x1 ||
+                                p_page->i_teletext_type == 0x2 ||
+                                p_page->i_teletext_type == 0x5 )
                             {
                                 ts_es_t *p_es;
 
@@ -3416,6 +3417,16 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
                                 }
                                 switch( p_page->i_teletext_type )
                                 {
+                                case 0x1:
+                                    p_es->fmt.psz_description =
+                                        strdup(_("Teletext initial page"));
+                                    msg_Dbg( p_demux,
+                                             "    * sub lan=%s page=%d%x",
+                                             p_es->fmt.psz_language,
+                                             p_page->i_teletext_magazine_number,
+                                             p_page->i_teletext_page_number );
+                                    break;
+
                                 case 0x2:
                                     p_es->fmt.psz_description =
                                         strdup(_("Teletext subtitles"));




More information about the vlc-devel mailing list