[MPlayer-cvslog] r28364 - in trunk/libmpcodecs: vf_mcdeint.c vf_spp.c

[diego]

Author: diego
Date: Sun Jan 25 23:34:26 2009
New Revision: 28364

Log:
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.

Modified:
   trunk/libmpcodecs/vf_mcdeint.c
   trunk/libmpcodecs/vf_spp.c

Modified: trunk/libmpcodecs/vf_mcdeint.c
==============================================================================
--- trunk/libmpcodecs/vf_mcdeint.c	Sun Jan 25 23:12:42 2009	(r28363)
+++ trunk/libmpcodecs/vf_mcdeint.c	Sun Jan 25 23:34:26 2009	(r28364)
@@ -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

Modified: trunk/libmpcodecs/vf_spp.c
==============================================================================
--- trunk/libmpcodecs/vf_spp.c	Sun Jan 25 23:12:42 2009	(r28363)
+++ trunk/libmpcodecs/vf_spp.c	Sun Jan 25 23:34:26 2009	(r28364)
@@ -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