Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
28326:51797a3b96d2 28327:c39a1fd7d45c
18 18
19 #include "mpg123.h" 19 #include "mpg123.h"
20 #include "huffman.h" 20 #include "huffman.h"
21 #include "mp3.h" 21 #include "mp3.h"
22 #include "libavutil/common.h" 22 #include "libavutil/common.h"
23 #include "libavutil/internal.h"
23 #include "mpbswap.h" 24 #include "mpbswap.h"
24 #include "cpudetect.h" 25 #include "cpudetect.h"
25 //#include "liba52/mm_accel.h" 26 //#include "liba52/mm_accel.h"
26 #include "mp_msg.h" 27 #include "mp_msg.h"
27 28
28 #include "libvo/fastmemcpy.h" 29 #include "libvo/fastmemcpy.h"
30
31 #undef fprintf
32 #undef printf
29 33
30 #if ARCH_X86_64 34 #if ARCH_X86_64
31 // 3DNow! and 3DNow!Ext routines don't compile under AMD64 35 // 3DNow! and 3DNow!Ext routines don't compile under AMD64
32 #undef HAVE_3DNOW 36 #undef HAVE_3DNOW
33 #undef HAVE_3DNOWEXT 37 #undef HAVE_3DNOWEXT