Mercurial > mplayer.hg

comparison libmpcodecs/vf_geq.c @ 24738:45189040161d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reorder #includes to get rid of the FIXME
author zuxy
date Fri, 12 Oct 2007 03:17:43 +0000
parents 90302c23df72
children 14e4e1ca7988
comparison
equal deleted inserted replaced
24737:90302c23df72 24738:45189040161d
25 #include "config.h" 25 #include "config.h"
26 26
27 #include "mp_msg.h" 27 #include "mp_msg.h"
28 #include "cpudetect.h" 28 #include "cpudetect.h"
29 29
30 #include "img_format.h"
31 #include "mp_image.h"
32 #include "vf.h"
33
30 // Needed to bring in lrintf. 34 // Needed to bring in lrintf.
31 #define HAVE_AV_CONFIG_H 35 #define HAVE_AV_CONFIG_H
32 36
33 #include "libavcodec/avcodec.h" 37 #include "libavcodec/avcodec.h"
34 #include "libavcodec/dsputil.h" 38 #include "libavcodec/dsputil.h"
35 #include "libavcodec/eval.h" 39 #include "libavcodec/eval.h"
36 #include "libavutil/common.h" 40 #include "libavutil/common.h"
37
38 /* FIXME: common.h defines fprintf away when HAVE_AV_CONFIG
39 * is defined, but mp_image.h needs fprintf.
40 */
41 #undef fprintf
42
43 #include "img_format.h"
44 #include "mp_image.h"
45 #include "vf.h"
46
47 41
48 struct vf_priv_s { 42 struct vf_priv_s {
49 AVEvalExpr * e[3]; 43 AVEvalExpr * e[3];
50 int framenum; 44 int framenum;
51 mp_image_t *mpi; 45 mp_image_t *mpi;