diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-25 21:59:08 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-25 21:59:08 +0000 |
| commit | 4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0 (patch) | |
| tree | 572f51059b841ce257b9598563b9ca69818daf33 | |
| parent | 401ea8e1db542e58b290fc0f5787f5247db34826 (diff) | |
| download | mpv-4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0.tar.bz2 mpv-4ac4b493a9c88767fdeca5ac2c18578a0cf3e1f0.tar.xz | |
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28362 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/vf_fspp.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_pp.c | 3 | ||||
| -rw-r--r-- | mp3lib/sr1.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index a5e360306f..cf3aac3768 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -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 diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 2b4b6931b0..c538ee17f4 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -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]; diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 9444acd863..6606ed3429 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -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 |