[MPlayer-cvslog] r28362 - in trunk: libmpcodecs/vf_fspp.c libmpcodecs/vf_pp.c mp3lib/sr1.c

[diego]

Author: diego
Date: Sun Jan 25 22:59:08 2009
New Revision: 28362

Log:
Fix compilation after changes to DECLARE_ASM_CONST macro in FFmpeg.

Modified:
   trunk/libmpcodecs/vf_fspp.c
   trunk/libmpcodecs/vf_pp.c
   trunk/mp3lib/sr1.c

Modified: trunk/libmpcodecs/vf_fspp.c
==============================================================================
--- trunk/libmpcodecs/vf_fspp.c	Sun Jan 25 22:03:02 2009	(r28361)
+++ trunk/libmpcodecs/vf_fspp.c	Sun Jan 25 22:59:08 2009	(r28362)
@@ -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
 

Modified: trunk/libmpcodecs/vf_pp.c
==============================================================================
--- trunk/libmpcodecs/vf_pp.c	Sun Jan 25 22:03:02 2009	(r28361)
+++ trunk/libmpcodecs/vf_pp.c	Sun Jan 25 22:59:08 2009	(r28362)
@@ -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];

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	Sun Jan 25 22:03:02 2009	(r28361)
+++ trunk/mp3lib/sr1.c	Sun Jan 25 22:59:08 2009	(r28362)
@@ -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