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 /mp3lib | |
| 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 'mp3lib')
| -rw-r--r-- | mp3lib/sr1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index aadb22c388..9aa4dec827 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -19,8 +19,6 @@ #include "mpg123.h" #include "huffman.h" #include "mp3.h" -#include "libavutil/common.h" -#include "libavutil/internal.h" #include "mpbswap.h" #include "cpudetect.h" //#include "liba52/mm_accel.h" @@ -28,6 +26,9 @@ #include "libvo/fastmemcpy.h" +#include "libavutil/common.h" +#include "libavutil/internal.h" + #undef fprintf #undef printf |