* modules/demux/mpeg: 0x06 stream type can be used for something else

  than A/52, so disabled it for the moment (we should actually check for
  the presence of a descriptor).

diff --git a/modules/demux/mpeg/system.c b/modules/demux/mpeg/system.c
index 2d85ccf5f5bd8d1fd0aaa549fe1f008b074d5ca9..3ba73c36b27124c312365c726c7a50baa14d8311 100644 (file)
--- a/modules/demux/mpeg/system.c
+++ b/modules/demux/mpeg/system.c
@@ -2,7 +2,7 @@
  * system.c: helper module for TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: system.c,v 1.15 2003/07/03 00:11:38 fenrir Exp $
+ * $Id: system.c,v 1.16 2003/07/13 12:35:13 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -665,7 +665,6 @@ static void DecodePSM( input_thread_t * p_input, data_packet_t * p_data )
                 i_cat = AUDIO_ES;
                 break;
             case A52_AUDIO_ES:
-            case A52DVB_AUDIO_ES:
                 i_fourcc = VLC_FOURCC('a','5','2','b');
                 i_cat = AUDIO_ES;
                 break;

diff --git a/modules/demux/mpeg/system.h b/modules/demux/mpeg/system.h
index 40a6504ce0b8f68790a89f1faae125038e19eb0b..6ea359ad329e10c95957196dcde50f0ccf09e1f2 100644 (file)
--- a/modules/demux/mpeg/system.h
+++ b/modules/demux/mpeg/system.h
@@ -2,7 +2,7 @@
  * system.h: MPEG demultiplexing.
  *****************************************************************************
  * Copyright (C) 1999-2002 VideoLAN
- * $Id: system.h,v 1.7 2003/03/18 23:59:07 massiot Exp $
+ * $Id: system.h,v 1.8 2003/07/13 12:35:13 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -46,7 +46,9 @@
 #define MPEG2_VIDEO_ES      0x02
 #define MPEG1_AUDIO_ES      0x03
 #define MPEG2_AUDIO_ES      0x04
-#define A52DVB_AUDIO_ES     0x06
+/* This one is "private PES". It may carry teletext and DVB, and we ought
+ * to check for the presence of a descriptor, but we don't. */
+#define PESDVB_AUDIO_ES     0x06
 
 #define MPEG4_VIDEO_ES      0x10
 #define MPEG4_AUDIO_ES      0x11

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 83db4e0f7174be4f1e04ef9b6fbb0d83dad9e212..9f602020a2415dbeccf515b3e78da1ffcd478483 100644 (file)
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ts.c,v 1.28 2003/06/25 19:28:10 fenrir Exp $
+ * $Id: ts.c,v 1.29 2003/07/13 12:35:13 massiot Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -656,7 +656,6 @@ static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
                             i_cat = AUDIO_ES;
                             break;
                         case A52_AUDIO_ES:
-                        case A52DVB_AUDIO_ES:
                             if ( !b_vls_compat )
                                 i_fourcc = VLC_FOURCC('a','5','2',' ');
                             else
@@ -1317,7 +1316,6 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
                     i_cat = AUDIO_ES;
                     break;
                 case A52_AUDIO_ES:
-                case A52DVB_AUDIO_ES:
                     if ( !b_vls_compat )
                         i_fourcc = VLC_FOURCC('a','5','2',' ');
                     else
@@ -1604,7 +1602,6 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
                         strcat( psz_desc, " (lpcm)" );
                         break;
                     case A52_AUDIO_ES:
-                    case A52DVB_AUDIO_ES:
                     case A52B_AUDIO_ES:
                         strcat( psz_desc, " (A52)" );
                         break;