* Fixed a bug in LPCM codec.

* Changed an error into a warning.

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index 6017b37ce90143266d2eaca4deae162fc31206e8..8f3da92ee0cf1acf128d4956751476eae95b4c89 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -2,7 +2,7 @@
  * lpcm.c: lpcm decoder module
  *****************************************************************************
  * 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>
  *          Henri Fallon <henri@videolan.org>
@@ -202,12 +202,14 @@ static void DecodeFrame( dec_thread_t * p_dec )
         i_rate = 48000;
         break;
     case 1:
+        i_rate = 96000;
+        break;
+    case 2:
+        i_rate = 44100;
+        break;
+    case 3:
         i_rate = 32000;
         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 )

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 785200862b2ea6ed06ba4f3072b216fb8359e717..28fe71fe8f649e405dc6545cd1b05a186ee8a108 100644 (file)
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -2,7 +2,7 @@
  * ps.c : Program Stream input module for vlc
  *****************************************************************************
  * 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>
  *
@@ -95,7 +95,7 @@ static int Activate( vlc_object_t * p_this )
         if( *p_input->psz_demux && !strncmp( p_input->psz_demux, "ps", 3 ) )
         {
             /* 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
         {