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 /mp3lib/decode_mmx.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
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 'mp3lib/decode_mmx.c')
| -rw-r--r-- | mp3lib/decode_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mp3lib/decode_mmx.c b/mp3lib/decode_mmx.c index 613a11cf35..55dc6a9081 100644 --- a/mp3lib/decode_mmx.c +++ b/mp3lib/decode_mmx.c @@ -217,7 +217,7 @@ int synth_1to1_MMX(real *bandPtr, int channel, short *samples) dct64_MMX_func(a, b, bandPtr); window = mp3lib_decwins + 16 - bo1; //printf("DEBUG: channel %d, bo %d, off %d\n", channel, bo, 16 - bo1); -__asm __volatile( +__asm__ volatile( ASMALIGN(4) ".L03:\n\t" "movq (%1),%%mm0\n\t" |