Index: common/mp4ff/mp4atom.c
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4atom.c,v
retrieving revision 1.22
diff -u -r1.22 mp4atom.c
--- common/mp4ff/mp4atom.c	1 Feb 2005 13:15:55 -0000	1.22
+++ common/mp4ff/mp4atom.c	11 Sep 2005 12:44:42 -0000
@@ -299,7 +299,8 @@
     f->track[f->total_tracks - 1]->decoderConfig = malloc(f->track[f->total_tracks - 1]->decoderConfigLen);
     if (f->track[f->total_tracks - 1]->decoderConfig)
     {
-        mp4ff_read_data(f, f->track[f->total_tracks - 1]->decoderConfig, f->track[f->total_tracks - 1]->decoderConfigLen);
+        mp4ff_read_data(f, (int8_t*)(f->track[f->total_tracks - 1]->
+            decoderConfig), f->track[f->total_tracks - 1]->decoderConfigLen);
     } else {
         f->track[f->total_tracks - 1]->decoderConfigLen = 0;
     }
Index: common/mp4ff/mp4ff.c
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4ff.c,v
retrieving revision 1.17
diff -u -r1.17 mp4ff.c
--- common/mp4ff/mp4ff.c	1 Feb 2005 13:15:55 -0000	1.17
+++ common/mp4ff/mp4ff.c	11 Sep 2005 12:44:42 -0000
@@ -428,7 +428,7 @@
 
     mp4ff_set_sample_position(f, track, sample);
 
-    result = mp4ff_read_data(f, *audio_buffer, *bytes);
+    result = mp4ff_read_data(f, (int8_t*)*audio_buffer, *bytes);
 
     if (!result)
 	{
@@ -454,7 +454,7 @@
 	int32_t size = mp4ff_audio_frame_size(f,track,sample);
 	if (size<=0) return 0;
 	mp4ff_set_sample_position(f, track, sample);
-	result = mp4ff_read_data(f,buffer,size);
+	result = mp4ff_read_data(f,(int8_t*)buffer,size);
 
 #ifdef ITUNES_DRM
     if (f->track[track]->p_drms != NULL)
Index: common/mp4ff/mp4ff.h
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4ff.h,v
retrieving revision 1.22
diff -u -r1.22 mp4ff.h
--- common/mp4ff/mp4ff.h	1 Feb 2005 13:15:55 -0000	1.22
+++ common/mp4ff/mp4ff.h	11 Sep 2005 12:44:42 -0000
@@ -128,4 +128,4 @@
 }
 #endif /* __cplusplus */
 
-#endif
\ No newline at end of file
+#endif
Index: common/mp4ff/mp4ffint.h
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4ffint.h,v
retrieving revision 1.19
diff -u -r1.19 mp4ffint.h
--- common/mp4ff/mp4ffint.h	1 Feb 2005 13:15:55 -0000	1.19
+++ common/mp4ff/mp4ffint.h	11 Sep 2005 12:44:42 -0000
@@ -347,7 +347,6 @@
 mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
 #endif
 void mp4ff_close(mp4ff_t *ff);
-void mp4ff_track_add(mp4ff_t *f);
 int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only);
 int32_t parse_atoms(mp4ff_t *f,int meta_only);
 
Index: common/mp4ff/mp4meta.c
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4meta.c,v
retrieving revision 1.16
diff -u -r1.16 mp4meta.c
--- common/mp4ff/mp4meta.c	1 Feb 2005 13:15:55 -0000	1.16
+++ common/mp4ff/mp4meta.c	11 Sep 2005 12:44:43 -0000
@@ -425,4 +425,4 @@
     return mp4ff_meta_find_by_name(f, "cover", value);
 }
 
-#endif
\ No newline at end of file
+#endif
Index: common/mp4ff/mp4tagupdate.c
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4tagupdate.c,v
retrieving revision 1.5
diff -u -r1.5 mp4tagupdate.c
--- common/mp4ff/mp4tagupdate.c	1 Feb 2005 13:15:55 -0000	1.5
+++ common/mp4ff/mp4tagupdate.c	11 Sep 2005 12:44:43 -0000
@@ -143,7 +143,7 @@
 	bufptr = membuffer_get_ptr(buf);
 	if (bufptr==0) return 0;
 	
-	if ((unsigned)mp4ff_read_data(src,(char*)bufptr + oldsize,bytes)!=bytes)
+	if ((unsigned)mp4ff_read_data(src,(int8_t*)bufptr + oldsize,bytes)!=bytes)
 	{
 		membuffer_set_error(buf);
 		return 0;
@@ -406,7 +406,7 @@
 		if (remaining < 8) break;
 		atom_size = mp4ff_read_int32(f);
 		if (atom_size > remaining || atom_size < 8) break;
-		mp4ff_read_data(f,atom_name,4);
+		mp4ff_read_data(f,(int8_t*)atom_name,4);
 		
 		if (!memcmp(atom_name,name,4))
 		{
@@ -573,21 +573,21 @@
 		p_out = (uint8_t*)*out_buffer;
 		
 		mp4ff_set_position(f,total_base);
-		mp4ff_read_data(f,p_out,(uint32_t)(udta_offset - total_base )); p_out += (uint32_t)(udta_offset - total_base );
+		mp4ff_read_data(f,(int8_t*)p_out,(uint32_t)(udta_offset - total_base )); p_out += (uint32_t)(udta_offset - total_base );
 		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-		mp4ff_read_data(f,p_out,(uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
+		mp4ff_read_data(f,(int8_t*)p_out,4); p_out += 4;
+		mp4ff_read_data(f,(int8_t*)p_out,(uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
 		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-		mp4ff_read_data(f,p_out,(uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
+		mp4ff_read_data(f,(int8_t*)p_out,4); p_out += 4;
+		mp4ff_read_data(f,(int8_t*)p_out,(uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
 		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
+		mp4ff_read_data(f,(int8_t*)p_out,4); p_out += 4;
 
 		memcpy(p_out,new_ilst_buffer,new_ilst_size);
 		p_out += new_ilst_size;
 
 		mp4ff_set_position(f,ilst_offset + ilst_size);
-		mp4ff_read_data(f,p_out,(uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
+		mp4ff_read_data(f,(int8_t*)p_out,(uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
 
 		free(new_ilst_buffer);
 	}
@@ -622,18 +622,18 @@
 
         /* rename old moov to free */
         mp4ff_set_position(ff, ff->moov_offset + 4);
-        mp4ff_write_data(ff, free_data, 4);
+        mp4ff_write_data(ff, (int8_t*)free_data, 4);
 	
         mp4ff_set_position(ff, ff->file_size);
 		mp4ff_write_int32(ff,new_moov_size + 8);
-		mp4ff_write_data(ff,"moov",4);
-		mp4ff_write_data(ff, new_moov_data, new_moov_size);
+		mp4ff_write_data(ff,(int8_t*)"moov",4);
+		mp4ff_write_data(ff, (int8_t*)new_moov_data, new_moov_size);
     }
 	else
 	{
         mp4ff_set_position(ff, ff->moov_offset);
 		mp4ff_write_int32(ff,new_moov_size + 8);
-		mp4ff_write_data(ff,"moov",4);
+		mp4ff_write_data(ff,(int8_t*)"moov",4);
 		mp4ff_write_data(ff, new_moov_data, new_moov_size);
 	}
 
Index: common/mp4ff/mp4util.c
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4util.c,v
retrieving revision 1.17
diff -u -r1.17 mp4util.c
--- common/mp4ff/mp4util.c	1 Feb 2005 13:15:55 -0000	1.17
+++ common/mp4ff/mp4util.c	11 Sep 2005 12:44:43 -0000
@@ -69,7 +69,7 @@
 
     result = (a<<24) | (b<<16) | (c<<8) | d;
 
-    return mp4ff_write_data(f,(uint8_t*)&result,sizeof(result));
+    return mp4ff_write_data(f,(int8_t*)&result,sizeof(result));
 }
 
 int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position)
@@ -91,7 +91,7 @@
     uint64_t result = 0;
     int8_t i;
 
-    mp4ff_read_data(f, data, 8);
+    mp4ff_read_data(f, (int8_t*)data, 8);
 
     for (i = 0; i < 8; i++)
     {
@@ -151,7 +151,7 @@
 	char * str = (char*)malloc(length + 1);
 	if (str!=0)
 	{
-		if ((uint32_t)mp4ff_read_data(f,str,length)!=length)
+		if ((uint32_t)mp4ff_read_data(f,(int8_t*)str,length)!=length)
 		{
 			free(str);
 			str = 0;
@@ -167,7 +167,7 @@
 uint8_t mp4ff_read_char(mp4ff_t *f)
 {
     uint8_t output;
-    mp4ff_read_data(f, &output, 1);
+    mp4ff_read_data(f, (int8_t*)&output, 1);
     return output;
 }
 
Index: frontend/main.c
===================================================================
RCS file: /cvsroot/faac/faad2/frontend/main.c,v
retrieving revision 1.77
diff -u -r1.77 main.c
--- frontend/main.c	1 Feb 2005 13:15:56 -0000	1.77
+++ frontend/main.c	11 Sep 2005 12:44:43 -0000
@@ -41,6 +41,8 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
 #include <getopt.h>
 
 #include <neaacdec.h>