Skip to content

V
vlc
Commit e7d66505 authored by Damien Lucas's avatar Damien Lucas
Browse files
Options

. in PMT decoder, fix the iso639-2B language code decoding bug: 

   only iso-639-2T codes were decoded
parent 17a52d7d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 74 deletions
modules/demux/mpeg/ts.c
View file @ e7d66505
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc * mpeg_ts.c : Transport Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: ts.c,v 1.37 2003/09/20 17:35:38 gbazin Exp $ * $Id: ts.c,v 1.38 2003/10/27 13:35:15 nitrox Exp $
* *
* Authors: Henri Fallon <henri@via.ecp.fr> * Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr> * Johan Bilien <jobi@via.ecp.fr>
...@@ -1628,7 +1628,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input, ...@@ -1628,7 +1628,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
const iso639_lang_t * p_iso; const iso639_lang_t * p_iso;
p_iso = GetLang_2T((char*)p_decoded->i_iso_639_code); p_iso = GetLang_2T((char*)p_decoded->i_iso_639_code);
if( p_iso ) if( p_iso && strcmp(p_iso->psz_native_name,"Unknown"))
{ {
if( p_iso->psz_native_name[0] ) if( p_iso->psz_native_name[0] )
strncpy( psz_desc, strncpy( psz_desc,
...@@ -1639,7 +1639,21 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input, ...@@ -1639,7 +1639,21 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
} }
else else
{ {
strncpy( psz_desc, p_decoded->i_iso_639_code, 3 ); p_iso = GetLang_2B(
(char*)p_decoded->i_iso_639_code);
if ( p_iso )
{
if( p_iso->psz_native_name[0] )
strncpy( psz_desc,
p_iso->psz_native_name, 20 );
else
strncpy( psz_desc,
p_iso->psz_eng_name, 20 );
}
else
{
strncpy( psz_desc, p_decoded->i_iso_639_code, 3 );
}
} }
} }
} }
......
modules/mux/mpeg/ts.c
View file @ e7d66505
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ts.c: MPEG-II TS Muxer * ts.c: MPEG-II TS Muxer
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: ts.c,v 1.31 2003/08/26 01:04:29 fenrir Exp $ * $Id: ts.c,v 1.32 2003/10/27 13:35:15 nitrox Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -674,7 +674,7 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -674,7 +674,7 @@ static int Mux( sout_mux_t *p_mux )
p_sys->i_dts, p_sys->i_dts,
p_sys->i_length, p_sys->i_length,
3 * p_sys->i_pcr_delay/2 ); /* latency is equal to i_pcr_delay 3 * p_sys->i_pcr_delay/2 ); /* latency is equal to i_pcr_delay
3/2 is for security */ 3/2 is for security */
sout_AccessOutWrite( p_mux->p_access, p_ts ); sout_AccessOutWrite( p_mux->p_access, p_ts );
/* Reset the ts chain */ /* Reset the ts chain */
......
po/de.po
View file @ e7d66505
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc 0.73.3\n" "Project-Id-Version: vlc 0.73.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2002-04-18 23:38+0100\n" "PO-Revision-Date: 2002-04-18 23:38+0100\n"
"Last-Translator: Felix Khne <fk@aenneburghardt.de>\n" "Last-Translator: Felix Khne <fk@aenneburghardt.de>\n"
...@@ -15,6 +14,7 @@ msgstr "" ...@@ -15,6 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
#, fuzzy #, fuzzy
......
po/en_GB.po
View file @ e7d66505
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n" "PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n" "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
...@@ -25,6 +24,7 @@ msgstr "" ...@@ -25,6 +24,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
msgid "VLC Preferences" msgid "VLC Preferences"
......
po/es.po
View file @ e7d66505
This diff is collapsed.
po/fr.po
View file @ e7d66505
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2001-12-10 13:32+0100\n" "PO-Revision-Date: 2001-12-10 13:32+0100\n"
"Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be> 2003-07-27\n" "Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be> 2003-07-27\n"
...@@ -14,6 +13,7 @@ msgstr "" ...@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n" "Content-Transfer-Encoding: 8-bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
#, fuzzy #, fuzzy
......
po/it.po
View file @ e7d66505
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2003-07-24 15:00+0100\n" "PO-Revision-Date: 2003-07-24 15:00+0100\n"
"Last-Translator: Vella Bruno\n" "Last-Translator: Vella Bruno\n"
...@@ -14,6 +13,7 @@ msgstr "" ...@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
#, fuzzy #, fuzzy
......
po/ja.po
View file @ e7d66505
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2003-01-09 02:37+0900\n" "PO-Revision-Date: 2003-01-09 02:37+0900\n"
"Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n" "Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
...@@ -12,6 +11,7 @@ msgstr "" ...@@ -12,6 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n" "Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
#, fuzzy #, fuzzy
......
po/nl.po
View file @ e7d66505
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2002-04-20 16:58GMT\n" "PO-Revision-Date: 2002-04-20 16:58GMT\n"
"Last-Translator: Derk-Jan Hartman <thedj at sf.net>\n" "Last-Translator: Derk-Jan Hartman <thedj at sf.net>\n"
...@@ -14,6 +13,7 @@ msgstr "" ...@@ -14,6 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 0.8\n" "X-Generator: KBabel 0.8\n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
......
po/no.po
View file @ e7d66505
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2003-04-06 12:32+0200\n" "PO-Revision-Date: 2003-04-06 12:32+0200\n"
"Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n" "Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
...@@ -12,6 +11,7 @@ msgstr "" ...@@ -12,6 +11,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
#, fuzzy #, fuzzy
......
po/pl.po
View file @ e7d66505
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: vlc\n" "Project-Id-Version: vlc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-10-10 09:29+0200\n" "POT-Creation-Date: 2003-10-10 09:29+0200\n"
"PO-Revision-Date: 2002-07-12 11:49+0100\n" "PO-Revision-Date: 2002-07-12 11:49+0100\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n" "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
...@@ -13,6 +12,7 @@ msgstr "" ...@@ -13,6 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n" "Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#: include/vlc_help.h:32 #: include/vlc_help.h:32
#, fuzzy #, fuzzy
......
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