* ./plugins/mpeg_system: fixed a parsing bug I introduced yesterday.

diff --git a/plugins/mpeg_system/mpeg_es.c b/plugins/mpeg_system/mpeg_es.c
index 714bfc80efb1d3b39f17492bccd2c05fcbf00987..861266f286573f083fd42cb4e795732b26fe752c 100644 (file)
--- a/plugins/mpeg_system/mpeg_es.c
+++ b/plugins/mpeg_system/mpeg_es.c
@@ -2,7 +2,7 @@
  * mpeg_es.c : Elementary Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: mpeg_es.c,v 1.4 2002/03/01 00:33:18 massiot Exp $
+ * $Id: mpeg_es.c,v 1.5 2002/03/15 17:17:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -113,7 +113,7 @@ static int ESInit( input_thread_t * p_input )
 
     if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
     {
-        if( p_input->psz_demux && strncmp( p_input->psz_demux, "es", 3 ) )
+        if( *p_input->psz_demux && strncmp( p_input->psz_demux, "es", 3 ) )
         {
             /* User forced */
             intf_ErrMsg( "input error: this doesn't seem like an MPEG stream, continuing" );
@@ -126,7 +126,7 @@ static int ESInit( input_thread_t * p_input )
     }
     else if( *(p_peek + 3) > 0xb9 )
     {
-        if( p_input->psz_demux && strncmp( p_input->psz_demux, "es", 3 ) )
+        if( *p_input->psz_demux && strncmp( p_input->psz_demux, "es", 3 ) )
         {
             /* User forced */
             intf_ErrMsg( "input error: this seems to be a system stream (PS plug-in ?), but continuing" );

diff --git a/plugins/mpeg_system/mpeg_ps.c b/plugins/mpeg_system/mpeg_ps.c
index cb393e2cdfad285c30b302877ad7983e49e80125..37fa5f0152daa94586adaafd4e1e38ba7342e87c 100644 (file)
--- a/plugins/mpeg_system/mpeg_ps.c
+++ b/plugins/mpeg_system/mpeg_ps.c
@@ -2,7 +2,7 @@
  * mpeg_ps.c : Program Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ps.c,v 1.6 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: mpeg_ps.c,v 1.7 2002/03/15 17:17:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -107,7 +107,7 @@ static int PSInit( input_thread_t * p_input )
 
     if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 )
     {
-        if( p_input->psz_demux && strncmp( p_input->psz_demux, "ps", 3 ) )
+        if( *p_input->psz_demux && strncmp( p_input->psz_demux, "ps", 3 ) )
         {
             /* User forced */
             intf_ErrMsg( "input error: this doesn't seem like an MPEG stream, continuing" );
@@ -120,7 +120,7 @@ static int PSInit( input_thread_t * p_input )
     }
     else if( *(p_peek + 3) <= 0xb9 )
     {
-        if( p_input->psz_demux && strncmp( p_input->psz_demux, "ps", 3 ) )
+        if( *p_input->psz_demux && strncmp( p_input->psz_demux, "ps", 3 ) )
         {
             /* User forced */
             intf_ErrMsg( "input error: this seems to be an elementary stream (ES plug-in ?),");

diff --git a/plugins/mpeg_system/mpeg_ts.c b/plugins/mpeg_system/mpeg_ts.c
index 809bf9cf07811da98f0f9b606cd90e5b2eeb93dc..7d12c6402694f344b0afa23b76f93f1737f0a7b7 100644 (file)
--- a/plugins/mpeg_system/mpeg_ts.c
+++ b/plugins/mpeg_system/mpeg_ts.c
@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ts.c,v 1.5 2002/03/04 23:56:37 massiot Exp $
+ * $Id: mpeg_ts.c,v 1.6 2002/03/15 17:17:35 sam Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *
@@ -107,7 +107,7 @@ static int TSInit( input_thread_t * p_input )
 
     if( *p_peek != TS_SYNC_CODE )
     {
-        if( p_input->psz_demux && strncmp( p_input->psz_demux, "ts", 3 ) )
+        if( *p_input->psz_demux && strncmp( p_input->psz_demux, "ts", 3 ) )
         {
             /* User forced */
             intf_ErrMsg( "input error: this doesn't seem like a TS stream, continuing" );