diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_fspp.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_mcdeint.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vf_pp.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_spp.c | 5 |
4 files changed, 17 insertions, 0 deletions
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index 7c42819d20..5ba6188d15 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_mcdeint.c b/libmpcodecs/vf_mcdeint.c index f1b816d8ba..6983aa5163 100644 --- a/libmpcodecs/vf_mcdeint.c +++ b/libmpcodecs/vf_mcdeint.c @@ -56,10 +56,15 @@ Known Issues: #include "mp_msg.h" #include "cpudetect.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#undef fprintf +#undef free +#undef malloc + #ifdef HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 219fe920f1..c910595c4a 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/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index 50969c13fb..aa18534966 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -37,10 +37,15 @@ #include "mp_msg.h" #include "cpudetect.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#undef fprintf +#undef free +#undef malloc + #ifdef HAVE_MALLOC_H #include <malloc.h> #endif |