diff options
| author | Diego Pettenò <flameeyes@gmail.com> | 2008-10-16 13:34:30 +0000 |
|---|---|---|
| committer | Diego Pettenò <flameeyes@gmail.com> | 2008-10-16 13:34:30 +0000 |
| commit | 7ad6469eae0fc7bf1f2462436e900389ba6dd406 (patch) | |
| tree | c32b92b9c7ca09e3ca465824a189ef55b4ce2e24 /libswscale/swscale.c | |
| parent | be449fca79a3b0394143f0a77c99784e65868d9f (diff) | |
| download | ffmpeg-7ad6469eae0fc7bf1f2462436e900389ba6dd406.tar.gz | |
Convert asm keyword into __asm__.
Neither the asm() nor the __asm__() keyword is not part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).
Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 synta.
Originally committed as revision 27778 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 950a67a9a4..8b899c4493 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1061,7 +1061,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF int ret= -1; #if defined(ARCH_X86) if (flags & SWS_CPU_CAPS_MMX) - asm volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions) + __asm__ volatile("emms\n\t"::: "memory"); //FIXME this should not be required but it IS (even for non-MMX versions) #endif // Note the +1 is for the MMXscaler which reads over the end @@ -1450,7 +1450,7 @@ static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *fil //code fragment - asm volatile( + __asm__ volatile( "jmp 9f \n\t" // Begin "0: \n\t" @@ -1490,7 +1490,7 @@ static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *fil "=r" (fragmentLengthA) ); - asm volatile( + __asm__ volatile( "jmp 9f \n\t" // Begin "0: \n\t" @@ -2167,7 +2167,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d SwsFilter dummyFilter= {NULL, NULL, NULL, NULL}; #if defined(ARCH_X86) if (flags & SWS_CPU_CAPS_MMX) - asm volatile("emms\n\t"::: "memory"); + __asm__ volatile("emms\n\t"::: "memory"); #endif #if !defined(RUNTIME_CPUDETECT) || !defined (CONFIG_GPL) //ensure that the flags match the compiled variant if cpudetect is off |