Mercurial > mplayer.hg

changeset 28329:ed42e982e79f

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 22:34:26 +0000
parents 50c9bf3e41cf
children d985feb803b5
files libmpcodecs/vf_mcdeint.c libmpcodecs/vf_spp.c
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_mcdeint.c	Sun Jan 25 22:12:42 2009 +0000
+++ b/libmpcodecs/vf_mcdeint.c	Sun Jan 25 22:34:26 2009 +0000
@@ -56,10 +56,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
--- a/libmpcodecs/vf_spp.c	Sun Jan 25 22:12:42 2009 +0000
+++ b/libmpcodecs/vf_spp.c	Sun Jan 25 22:34:26 2009 +0000
@@ -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