* G726 settings for liveMedia refs #601

[vlc] / modules / demux / aiff.c

diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index b502a39d49a6d8cb8022f04065c415936bc411f1..c7fe525e375ea7ca01be31b7c7548cce7956f3d9 100644 (file)
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * aiff.c: Audio Interchange File Format 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -104,7 +104,7 @@ static int Open( vlc_object_t *p_this )
     uint8_t     *p_peek;
 
     if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC;
-    if( strncmp( &p_peek[0], "FORM", 4 ) || strncmp( &p_peek[8], "AIFF", 4 ) )
+    if( strncmp( (char *)&p_peek[0], "FORM", 4 ) || strncmp( (char *)&p_peek[8], "AIFF", 4 ) )
     {
         return VLC_EGENERIC;
     }
@@ -134,7 +134,7 @@ static int Open( vlc_object_t *p_this )
 
         msg_Dbg( p_demux, "chunk fcc=%4.4s size=%d", p_peek, i_size );
 
-        if( !strncmp( &p_peek[0], "COMM", 4 ) )
+        if( !strncmp( (char *)&p_peek[0], "COMM", 4 ) )
         {
             if( stream_Peek( p_demux->s, &p_peek, 18 + 8 ) < 18 + 8 )
             {
@@ -149,7 +149,7 @@ static int Open( vlc_object_t *p_this )
             msg_Dbg( p_demux, "COMM: channels=%d samples_frames=%d bits=%d rate=%d",
                      GetWBE( &p_peek[8] ), GetDWBE( &p_peek[10] ), GetWBE( &p_peek[14] ), GetF80BE( &p_peek[16] ) );
         }
-        else if( !strncmp( &p_peek[0], "SSND", 4 ) )
+        else if( !strncmp( (char *)&p_peek[0], "SSND", 4 ) )
         {
             if( stream_Peek( p_demux->s, &p_peek, 8 + 8 ) < 8 + 8 )
             {