Mercurial > mplayer.hg

diff mp3lib/sr1.c @ 28327:c39a1fd7d45c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
author diego
date Sun, 25 Jan 2009 21:59:08 +0000
parents 51797a3b96d2
children f375e517f6f6
line wrap: on
line diff
--- a/mp3lib/sr1.c	Sun Jan 25 21:03:02 2009 +0000
+++ b/mp3lib/sr1.c	Sun Jan 25 21:59:08 2009 +0000
@@ -20,6 +20,7 @@
 #include "huffman.h"
 #include "mp3.h"
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "mpbswap.h"
 #include "cpudetect.h"
 //#include "liba52/mm_accel.h"
@@ -27,6 +28,9 @@
 
 #include "libvo/fastmemcpy.h"
 
+#undef fprintf
+#undef printf
+
 #if ARCH_X86_64
 // 3DNow! and 3DNow!Ext routines don't compile under AMD64
 #undef HAVE_3DNOW