Fixed aiff support for stereo files and files with odd chunk size.

[vlc] / modules / demux / pva.c

diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index b699ea3b65d18cf4c8ae1db36c4beeae8cd6265d..5f9d138969d635fb6fb85e3dd68faad1db26f41a 100644 (file)
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * pva.c: PVA demuxer
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -27,11 +27,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-
-/* TODO:
- *  - ...
- */
+#include <vlc_demux.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -84,17 +80,12 @@ static int Open( vlc_object_t *p_this )
     es_format_t  fmt;
     uint8_t     *p_peek;
 
-    if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
+    if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
     if( p_peek[0] != 'A' || p_peek[1] != 'V' || p_peek[4] != 0x55 )
     {
         /* In case we had forced this demuxer we try to resynch */
         if( strcasecmp( p_demux->psz_demux, "pva" ) || ReSynch( p_demux ) )
         {
-            msg_Warn( p_demux, "PVA module discarded" );
             return VLC_EGENERIC;
         }
     }