diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /drivers/radeon_vid.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'drivers/radeon_vid.c')
| -rw-r--r-- | drivers/radeon_vid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/radeon_vid.c b/drivers/radeon_vid.c index 5a6bafd7dc..5514f1cb6c 100644 --- a/drivers/radeon_vid.c +++ b/drivers/radeon_vid.c @@ -129,7 +129,7 @@ static int swap_fourcc __initdata = 0; static inline double FastSin(double x) { register double res; - __asm __volatile("fsin":"=t"(res):"0"(x)); + __asm__ volatile("fsin":"=t"(res):"0"(x)); return res; } #undef sin @@ -138,7 +138,7 @@ static inline double FastSin(double x) static inline double FastCos(double x) { register double res; - __asm __volatile("fcos":"=t"(res):"0"(x)); + __asm__ volatile("fcos":"=t"(res):"0"(x)); return res; } #undef cos |