summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-12 03:17:43 +0000
committerzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-12 03:17:43 +0000
commitf53d4bcb3e76e76f4d2a0fd8f5e00f651a807673 (patch)
tree197c6a329d3896eb01a2b9c1dca1bc0fab5aab74
parentc212ce53e623b54dc59fb88619072fbf837f090b (diff)
downloadmpv-f53d4bcb3e76e76f4d2a0fd8f5e00f651a807673.tar.bz2
mpv-f53d4bcb3e76e76f4d2a0fd8f5e00f651a807673.tar.xz
Reorder #includes to get rid of the FIXME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24766 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/vf_geq.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c
index 330457d242..86e31e5cc8 100644
--- a/libmpcodecs/vf_geq.c
+++ b/libmpcodecs/vf_geq.c
@@ -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;