diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-16 20:17:56 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-16 20:17:56 +0000 |
| commit | 26b29f4f2d4284fb81647a00b81530f280881303 (patch) | |
| tree | 2ab0a30362d6cdf878efc039236befa860e28ae3 /libmpcodecs | |
| parent | 2195547220674940ef20e9ea38bb3610541d04b3 (diff) | |
| download | mpv-26b29f4f2d4284fb81647a00b81530f280881303.tar.bz2 mpv-26b29f4f2d4284fb81647a00b81530f280881303.tar.xz | |
Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/dec_video.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/native/mmx.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 3c31a01a7b..7d38891c1a 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -374,10 +374,10 @@ void *decode_video(sh_video_t *sh_video, unsigned char *start, int in_size, // some codecs are broken, and doesn't restore MMX state :( // it happens usually with broken/damaged files. if (gCpuCaps.has3DNow) { - __asm__ __volatile ("femms\n\t":::"memory"); + __asm__ volatile ("femms\n\t":::"memory"); } else if (gCpuCaps.hasMMX) { - __asm__ __volatile ("emms\n\t":::"memory"); + __asm__ volatile ("emms\n\t":::"memory"); } #endif diff --git a/libmpcodecs/native/mmx.h b/libmpcodecs/native/mmx.h index d9a6fb65cb..1661b318a4 100644 --- a/libmpcodecs/native/mmx.h +++ b/libmpcodecs/native/mmx.h @@ -57,24 +57,24 @@ typedef union { #define mmx_i2r(op,imm,reg) \ - __asm__ __volatile__ (#op " %0, %%" #reg \ + __asm__ volatile (#op " %0, %%" #reg \ : /* nothing */ \ : "i" (imm) ) #define mmx_m2r(op, mem, reg) \ - __asm__ __volatile__ (#op " %0, %%" #reg \ + __asm__ volatile (#op " %0, %%" #reg \ : /* nothing */ \ : "m" (mem)) #define mmx_r2m(op, reg, mem) \ - __asm__ __volatile__ (#op " %%" #reg ", %0" \ + __asm__ volatile (#op " %%" #reg ", %0" \ : "=m" (mem) \ : /* nothing */ ) #define mmx_r2r(op, regs, regd) \ - __asm__ __volatile__ (#op " %" #regs ", %" #regd) + __asm__ volatile (#op " %" #regs ", %" #regd) -#define emms() __asm__ __volatile__ ("emms") +#define emms() __asm__ volatile ("emms") #endif /* MPLAYER_MMX_H */ |