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 /libfaad2 | |
| 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 'libfaad2')
| -rw-r--r-- | libfaad2/common.h | 2 | ||||
| -rw-r--r-- | libfaad2/local_changes.diff | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libfaad2/common.h b/libfaad2/common.h index 29a30d089e..576e9ca115 100644 --- a/libfaad2/common.h +++ b/libfaad2/common.h @@ -69,7 +69,7 @@ extern "C" { /* Use if target platform has address generators with autoincrement */ //#define PREFER_POINTERS -#if defined(_WIN32_WCE) || defined(__arm__) +#if defined(_WIN32_WCE) || defined(__arm__) || defined(__avr32__) #define FIXED_POINT #endif diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff index a6400eb0b8..0e3fe95d41 100644 --- a/libfaad2/local_changes.diff +++ b/libfaad2/local_changes.diff @@ -52,7 +52,7 @@ //#define PREFER_POINTERS -#ifdef _WIN32_WCE -+#if defined(_WIN32_WCE) || defined(__arm__) ++#if defined(_WIN32_WCE) || defined(__arm__) || defined(__avr32__) #define FIXED_POINT #endif |