[MPlayer-cvslog] r24766 - trunk/libmpcodecs/vf_geq.c

[zuxy]

Author: zuxy
Date: Fri Oct 12 05:17:43 2007
New Revision: 24766

Log:
Reorder #includes to get rid of the FIXME


Modified:
   trunk/libmpcodecs/vf_geq.c

Modified: trunk/libmpcodecs/vf_geq.c
==============================================================================
--- trunk/libmpcodecs/vf_geq.c	(original)
+++ trunk/libmpcodecs/vf_geq.c	Fri Oct 12 05:17:43 2007
@@ -27,6 +27,10 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
+#include "img_format.h"
+#include "mp_image.h"
+#include "vf.h"
+
 // Needed to bring in lrintf.
 #define HAVE_AV_CONFIG_H
 
@@ -35,16 +39,6 @@
 #include "libavcodec/eval.h"
 #include "libavutil/common.h"
 
-/* FIXME: common.h defines fprintf away when HAVE_AV_CONFIG
- * is defined, but mp_image.h needs fprintf.
- */
-#undef fprintf
-
-#include "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-
-
 struct vf_priv_s {
     AVEvalExpr * e[3];
     int framenum;