Commit 39124c2d authored by Sam Hocevar's avatar Sam Hocevar

  * ./plugins/mpeg_system: fixed a parsing bug I introduced yesterday.
parent 0d972bf5
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg_es.c : Elementary Stream input module for vlc * mpeg_es.c : Elementary Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -113,7 +113,7 @@ static int ESInit( input_thread_t * p_input ) ...@@ -113,7 +113,7 @@ static int ESInit( input_thread_t * p_input )
if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 ) 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 */ /* User forced */
intf_ErrMsg( "input error: this doesn't seem like an MPEG stream, continuing" ); 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 ) ...@@ -126,7 +126,7 @@ static int ESInit( input_thread_t * p_input )
} }
else if( *(p_peek + 3) > 0xb9 ) 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 */ /* User forced */
intf_ErrMsg( "input error: this seems to be a system stream (PS plug-in ?), but continuing" ); intf_ErrMsg( "input error: this seems to be a system stream (PS plug-in ?), but continuing" );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg_ps.c : Program Stream input module for vlc * mpeg_ps.c : Program Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * 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> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -107,7 +107,7 @@ static int PSInit( input_thread_t * p_input ) ...@@ -107,7 +107,7 @@ static int PSInit( input_thread_t * p_input )
if( *p_peek || *(p_peek + 1) || *(p_peek + 2) != 1 ) 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 */ /* User forced */
intf_ErrMsg( "input error: this doesn't seem like an MPEG stream, continuing" ); 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 ) ...@@ -120,7 +120,7 @@ static int PSInit( input_thread_t * p_input )
} }
else if( *(p_peek + 3) <= 0xb9 ) 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 */ /* User forced */
intf_ErrMsg( "input error: this seems to be an elementary stream (ES plug-in ?),"); intf_ErrMsg( "input error: this seems to be an elementary stream (ES plug-in ?),");
......
...@@ -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: 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> * Authors: Henri Fallon <henri@via.ecp.fr>
* *
...@@ -107,7 +107,7 @@ static int TSInit( input_thread_t * p_input ) ...@@ -107,7 +107,7 @@ static int TSInit( input_thread_t * p_input )
if( *p_peek != TS_SYNC_CODE ) 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 */ /* User forced */
intf_ErrMsg( "input error: this doesn't seem like a TS stream, continuing" ); intf_ErrMsg( "input error: this doesn't seem like a TS stream, continuing" );
......
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