auhal: cleanup and better consistency

[vlc] / modules / access / mms / mmsh.c

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 30ff11b641f670637bd1dd5d39c5f5588151fbb8..2a2e85e4165fc7f1fb99ecc42a5815f02bc85e6d 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * mmsh.c:
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -345,7 +345,7 @@ static block_t *Block( access_t *p_access )
         const size_t i_offset = p_access->info.i_pos - p_sys->i_start;
         const size_t i_copy = p_sys->i_header - i_offset;
 
-        block_t *p_block = block_New( p_access, i_copy );
+        block_t *p_block = block_Alloc( i_copy );
         if( !p_block )
             return NULL;
 
@@ -364,7 +364,7 @@ static block_t *Block( access_t *p_access )
         if( __MAX( p_sys->i_packet_used, p_sys->i_packet_length ) < i_packet_min )
             i_padding = i_packet_min - __MAX( p_sys->i_packet_used, p_sys->i_packet_length );
 
-        block_t *p_block = block_New( p_access, i_copy + i_padding );
+        block_t *p_block = block_Alloc( i_copy + i_padding );
         if( !p_block )
             return NULL;
 
@@ -774,7 +774,7 @@ static int Start( access_t *p_access, uint64_t i_pos )
 
     for( i = 1; i < 128; i++ )
     {
-        if( p_sys->asfh.stream[i].i_cat == ASF_STREAM_UNKNOWN )
+        if( p_sys->asfh.stream[i].i_cat == ASF_CODEC_TYPE_UNKNOWN )
             continue;
         i_streams++;
         if( p_sys->asfh.stream[i].i_selected )
@@ -816,7 +816,7 @@ static int Start( access_t *p_access, uint64_t i_pos )
 
     for( i = 1; i < 128; i++ )
     {
-        if( p_sys->asfh.stream[i].i_cat != ASF_STREAM_UNKNOWN )
+        if( p_sys->asfh.stream[i].i_cat != ASF_CODEC_TYPE_UNKNOWN )
         {
             int i_select = 2;
             if( p_sys->asfh.stream[i].i_selected )