From 39124c2d60d0aa534eaed46eb4ade14f83ea06ce Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 15 Mar 2002 17:17:35 +0000 Subject: [PATCH] * ./plugins/mpeg_system: fixed a parsing bug I introduced yesterday. --- plugins/mpeg_system/mpeg_es.c | 6 +++--- plugins/mpeg_system/mpeg_ps.c | 6 +++--- plugins/mpeg_system/mpeg_ts.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/mpeg_system/mpeg_es.c b/plugins/mpeg_system/mpeg_es.c index 714bfc80ef..861266f286 100644 --- 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 * @@ -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 cb393e2cdf..37fa5f0152 100644 --- 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 * @@ -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 809bf9cf07..7d12c64026 100644 --- 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 * @@ -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" ); -- 2.39.5