Mercurial > mplayer.hg

changeset 28588:7f03a6d3c941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move FFmpeg #includes below all others so that they do not override system functions and cause the warning: In file included from libmpcodecs/vf_fspp.c:57: libmpcodecs/mp_image.h: In function 'new_mp_image': libmpcodecs/mp_image.h:214: warning: implicit declaration of function 'please_use_av_malloc' libmpcodecs/mp_image.h: In function 'free_mp_image': libmpcodecs/mp_image.h:226: warning: implicit declaration of function 'please_use_av_free'
author diego
date Tue, 17 Feb 2009 03:15:10 +0000
parents 1064e9bbaeea
children 00421bf8299f
files libmpcodecs/vf_fspp.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf_fspp.c	Tue Feb 17 03:08:56 2009 +0000
+++ b/libmpcodecs/vf_fspp.c	Tue Feb 17 03:15:10 2009 +0000
@@ -43,12 +43,6 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 
-#include "libavutil/internal.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/mem.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
@@ -58,6 +52,12 @@
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
 
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+
 #undef free
 #undef malloc