Fix build if mp4ff_int_types.h is installed (part of the faad update).

From Tobias Ulmer (tobiasu at tmux.org).
This commit is contained in:
fgsch 2009-03-11 00:36:06 +00:00
parent cb630ed693
commit 6400d0d5e8

View File

@ -1,7 +1,16 @@
$OpenBSD: patch-src_aac_libmp4_c,v 1.3 2009/01/25 02:07:06 fgsch Exp $
$OpenBSD: patch-src_aac_libmp4_c,v 1.4 2009/03/11 00:36:06 fgsch Exp $
--- src/aac/libmp4.c.orig Fri May 23 23:44:19 2008
+++ src/aac/libmp4.c Sun Jan 4 19:33:06 2009
@@ -88,7 +88,7 @@ static guint32 mp4_read_callback(void *data, void *buf
+++ src/aac/libmp4.c Tue Mar 10 20:48:31 2009
@@ -10,6 +10,8 @@
#include <audacious/output.h>
#include <audacious/i18n.h>
+#include "../../config.h"
+
#define MP4_VERSION VERSION
#define SBR_DEC
@@ -88,7 +90,7 @@ static guint32 mp4_read_callback(void *data, void *buf
return aud_vfs_fread(buffer, 1, len, (VFSFile *) data);
}
@ -10,7 +19,7 @@ $OpenBSD: patch-src_aac_libmp4_c,v 1.3 2009/01/25 02:07:06 fgsch Exp $
{
if (data == NULL)
return -1;
@@ -626,7 +626,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
@@ -626,7 +628,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
faacDecHandle decoder = 0;
guchar streambuffer[BUFFER_SIZE];
gulong bufferconsumed = 0;