Commit 25a00dad authored by Christophe Massiot's avatar Christophe Massiot

* Fixed a bug in LPCM codec.

* Changed an error into a warning.
parent 2130ab44
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* lpcm.c: lpcm decoder module * lpcm.c: lpcm decoder module
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: lpcm.c,v 1.11 2003/02/11 11:16:04 massiot Exp $ * $Id: lpcm.c,v 1.12 2003/03/03 14:19:09 massiot Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org> * Henri Fallon <henri@videolan.org>
...@@ -202,12 +202,14 @@ static void DecodeFrame( dec_thread_t * p_dec ) ...@@ -202,12 +202,14 @@ static void DecodeFrame( dec_thread_t * p_dec )
i_rate = 48000; i_rate = 48000;
break; break;
case 1: case 1:
i_rate = 96000;
break;
case 2:
i_rate = 44100;
break;
case 3:
i_rate = 32000; i_rate = 32000;
break; break;
default:
msg_Err( p_dec->p_fifo, "unsupported LPCM rate (0x%x)", i_header );
p_dec->p_fifo->b_error = 1;
return;
} }
switch ( i_header & 0x7 ) switch ( i_header & 0x7 )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ps.c : Program Stream input module for vlc * ps.c : Program Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: ps.c,v 1.7 2002/12/06 16:34:07 sam Exp $ * $Id: ps.c,v 1.8 2003/03/03 14:19:09 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -95,7 +95,7 @@ static int Activate( vlc_object_t * p_this ) ...@@ -95,7 +95,7 @@ static int Activate( vlc_object_t * p_this )
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 */
msg_Err( p_input, "this does not look like an MPEG PS stream, continuing" ); msg_Warn( p_input, "this does not look like an MPEG PS stream, continuing" );
} }
else else
{ {
......
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