# HG changeset patch
# User nenolod
# Date 1147308889 25200
# Node ID 2b42e48a688e9f4e5dfc2570b4efe121c6d87a12
# Parent  3b1dec2c5da0fa003b7ce0bd185458501ed93ce4
[svn] - fix a potential crash in our read callback (for VFS)
- typo fix

diff -r 3b1dec2c5da0 -r 2b42e48a688e Plugins/Input/aac/src/libmp4.c
--- a/Plugins/Input/aac/src/libmp4.c	Wed May 10 16:01:35 2006 -0700
+++ b/Plugins/Input/aac/src/libmp4.c	Wed May 10 17:54:49 2006 -0700
@@ -124,9 +124,11 @@
 
 uint32_t mp4_read_callback(void *data, void *buffer, uint32_t len)
 {
-	if (data == NULL)
+	if (data == NULL || buffer == NULL)
 		return -1;
 
+//	printf("%p\n", data);
+
 	return vfs_fread(buffer, 1, len, (VFSFile *) data);
 }
 
diff -r 3b1dec2c5da0 -r 2b42e48a688e configure.ac
--- a/configure.ac	Wed May 10 16:01:35 2006 -0700
+++ b/configure.ac	Wed May 10 17:54:49 2006 -0700
@@ -845,7 +845,7 @@
         Plugins/Input/mpg123/Makefile
 	Plugins/Input/aac/Makefile
 	Plugins/Input/aac/libmp4v2/Makefile
-	Plugins/Input/aac/libmp4ff/Makefile
+	Plugins/Input/aac/mp4ff/Makefile
 	Plugins/Input/aac/libfaad2/Makefile
 	Plugins/Input/aac/src/Makefile
 	Plugins/Input/modplug/Makefile