diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-17 03:15:10 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-17 03:15:10 +0000 |
| commit | 53067187b85ef66e7c472517cc308fe0ff29afae (patch) | |
| tree | 4b1c09b08df00d4e10e3d94b147290f532f0f62d | |
| parent | bc2834c3842898318932c5ac9d1db7ca54085578 (diff) | |
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'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28623 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/vf_fspp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index cf3aac3768..7d5ea52e14 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -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 |