Mercurial > mplayer.hg
changeset 28327:c39a1fd7d45c
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 | 50c9bf3e41cf |
| files | libmpcodecs/vf_fspp.c libmpcodecs/vf_pp.c mp3lib/sr1.c |
| diffstat | 3 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_fspp.c Sun Jan 25 21:03:02 2009 +0000 +++ b/libmpcodecs/vf_fspp.c Sun Jan 25 21:59:08 2009 +0000 @@ -43,6 +43,7 @@ #include "mp_msg.h" #include "cpudetect.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "libavcodec/avcodec.h" @@ -57,6 +58,9 @@ #include "vf.h" #include "libvo/fastmemcpy.h" +#undef free +#undef malloc + //===========================================================================// #define BLOCKSZ 12
--- a/libmpcodecs/vf_pp.c Sun Jan 25 21:03:02 2009 +0000 +++ b/libmpcodecs/vf_pp.c Sun Jan 25 21:59:08 2009 +0000 @@ -15,6 +15,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" +#include "libavutil/internal.h" #include "libpostproc/postprocess.h" #ifdef CONFIG_LIBPOSTPROC_A @@ -22,6 +23,8 @@ #include "libpostproc/postprocess_internal.h" #endif +#undef malloc + struct vf_priv_s { int pp; pp_mode_t *ppMode[PP_QUALITY_MAX+1];
--- 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