mirror of
https://github.com/mpv-player/mpv
synced 2025-04-11 04:01:31 +00:00
Reorder #includes to get rid of the FIXME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24766 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c212ce53e6
commit
f53d4bcb3e
@ -27,6 +27,10 @@
|
|||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
#include "cpudetect.h"
|
#include "cpudetect.h"
|
||||||
|
|
||||||
|
#include "img_format.h"
|
||||||
|
#include "mp_image.h"
|
||||||
|
#include "vf.h"
|
||||||
|
|
||||||
// Needed to bring in lrintf.
|
// Needed to bring in lrintf.
|
||||||
#define HAVE_AV_CONFIG_H
|
#define HAVE_AV_CONFIG_H
|
||||||
|
|
||||||
@ -35,16 +39,6 @@
|
|||||||
#include "libavcodec/eval.h"
|
#include "libavcodec/eval.h"
|
||||||
#include "libavutil/common.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 {
|
struct vf_priv_s {
|
||||||
AVEvalExpr * e[3];
|
AVEvalExpr * e[3];
|
||||||
int framenum;
|
int framenum;
|
||||||
|
Loading…
Reference in New Issue
Block a user