diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:07:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:45:36 +0200 |
| commit | 186e5a998c8424b3c850b62d6f5755a0928cd64c (patch) | |
| tree | cabc9881fb5ed2c6dbe5f771323a55c50136a091 /libmpcodecs/vf_fspp.c | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
| download | mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.bz2 mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.xz | |
Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
Diffstat (limited to 'libmpcodecs/vf_fspp.c')
| -rw-r--r-- | libmpcodecs/vf_fspp.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index 5ba6188d15..a72699d2d2 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -43,13 +43,7 @@ #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 +#if 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 @@ -690,7 +690,6 @@ const vf_info_t vf_info_fspp = { //Specific spp's dct, idct and threshold functions //I'd prefer to have them in the separate file. -#include "mangle.h" //#define MANGLE(a) #a //typedef int16_t DCTELEM; //! only int16_t |