* Added 0x80 as MPEG2_MOTO_VIDEO_ES, since some strange Motorola encoders

  do not follow the standard.

diff --git a/modules/access/satellite/access.c b/modules/access/satellite/access.c
index d59d85cd78f2aa6c3284ee8313d70c46db225049..252f3a0b4a6d7d42229c01f9fcc1b4526c73e71e 100644 (file)
--- a/modules/access/satellite/access.c
+++ b/modules/access/satellite/access.c
@@ -412,6 +412,7 @@ int SatelliteSetProgram( input_thread_t    * p_input,
         {
             case MPEG1_VIDEO_ES:
             case MPEG2_VIDEO_ES:
+            case MPEG2_MOTO_VIDEO_ES:
                 if ( input_SelectES( p_input , p_es ) == 0 )
                 {
                     ioctl_SetDMXFilter( p_es->i_id, &p_es->i_demux_fd, 1);

diff --git a/modules/demux/mpeg/system.c b/modules/demux/mpeg/system.c
index c49966cca927526e258b08ae44ee4889842c6e5b..0487ea9af4fad8dec81ba92e0318ba0bfac716a8 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.11 2003/03/09 23:39:05 jlj Exp $
+ * $Id: system.c,v 1.12 2003/03/18 23:59:07 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -641,6 +641,7 @@ static void DecodePSM( input_thread_t * p_input, data_packet_t * p_data )
             {
             case MPEG1_VIDEO_ES:
             case MPEG2_VIDEO_ES:
+            case MPEG2_MOTO_VIDEO_ES:
                 p_es->i_fourcc = VLC_FOURCC('m','p','g','v');
                 p_es->i_cat = VIDEO_ES;
                 break;

diff --git a/modules/demux/mpeg/system.h b/modules/demux/mpeg/system.h
index 9fa3deac51dca82144f65e4f13c7db2f38de0141..40a6504ce0b8f68790a89f1faae125038e19eb0b 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.6 2003/02/23 18:07:30 fenrir Exp $
+ * $Id: system.h,v 1.7 2003/03/18 23:59:07 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -51,6 +51,7 @@
 #define MPEG4_VIDEO_ES      0x10
 #define MPEG4_AUDIO_ES      0x11
 
+#define MPEG2_MOTO_VIDEO_ES 0x80
 #define A52_AUDIO_ES        0x81
 /* These ones might violate the usage : */
 #define DVD_SPU_ES          0x82

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index ff510aff9339a8c0f5c46c913d950968f71d2815..3b146e6f47099f61bdf7c173374f81b3cc462ece 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.19 2003/02/23 18:07:30 fenrir Exp $
+ * $Id: ts.c,v 1.20 2003/03/18 23:59:07 massiot Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -641,6 +641,7 @@ static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
                     {
                         case MPEG1_VIDEO_ES:
                         case MPEG2_VIDEO_ES:
+                        case MPEG2_MOTO_VIDEO_ES:
                             /* This isn't real, but we don't actually use
                              * it. */
                             p_new_es->i_stream_id = 0xE0;
@@ -1295,6 +1296,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
             {
                 case MPEG1_VIDEO_ES:
                 case MPEG2_VIDEO_ES:
+                case MPEG2_MOTO_VIDEO_ES:
                     p_new_es->i_fourcc = VLC_FOURCC('m','p','g','v');
                     p_new_es->i_cat = VIDEO_ES;
                     break;