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 /liba52/liba52_changes.diff | |
| 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 'liba52/liba52_changes.diff')
| -rw-r--r-- | liba52/liba52_changes.diff | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index 9a559a5036..0e9e71c53f 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -2354,7 +2354,8 @@ +#include "mm_accel.h" +#include "libavutil/avutil.h" - #ifdef HAVE_MEMALIGN +-#ifdef HAVE_MEMALIGN ++#if HAVE_MEMALIGN /* some systems have memalign() but no declaration for it */ void * memalign (size_t align, size_t size); -#else |