# HG changeset patch # User diego # Date 1234840510 0 # Node ID 7f03a6d3c94147bfaff6a159cc20ad47ea83b1ba # Parent 1064e9bbaeeaebe80bba9d90eae1ac18639acbf7 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' diff -r 1064e9bbaeea -r 7f03a6d3c941 libmpcodecs/vf_fspp.c --- 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 #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