diff options
| author | Nigel Pearson <nigel@ind.tansu.com.au> | 2006-11-07 07:07:05 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-11-07 07:07:05 +0000 |
| commit | d904b5fc66e675ac02e27f5420466df6cb683d62 (patch) | |
| tree | 347a79601f2542cdbb7bd6f737bfdc3cf80eb18a | |
| parent | 7d7912c34b67539cd64dea481eb2261f5215c335 (diff) | |
| download | ffmpeg-d904b5fc66e675ac02e27f5420466df6cb683d62.tar.gz | |
Fix MacIntel build: "/nop" is illegal on Apple's older version of GAS
Patch by Nigel Pearson % nigel A ind P tansu P com P au %
Original thread:
Date: Nov 6, 2006 10:43 PM
Subject: [Ffmpeg-devel] [PATCH] swscale uses /nop, illegal for old versions of GAS
Originally committed as revision 20740 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/rgb2rgb_template.c | 10 | ||||
| -rw-r--r-- | libswscale/swscale_template.c | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 04ccf1f681..0dbc657ced 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -60,8 +60,8 @@ #define PREFETCH "#" #define PREFETCHW "#" #else -#define PREFETCH "/nop" -#define PREFETCHW "/nop" +#define PREFETCH " # nop" +#define PREFETCHW " # nop" #endif #endif @@ -77,11 +77,7 @@ #define SFENCE "sfence" #else #define MOVNTQ "movq" -#ifdef __APPLE__ -#define SFENCE "#" -#else -#define SFENCE "/nop" -#endif +#define SFENCE " # nop" #endif static inline void RENAME(rgb24to32)(const uint8_t *src,uint8_t *dst,long src_size) diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 773f8f7811..d0f8d7d162 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -43,14 +43,14 @@ #define PREFETCH "prefetchnta" #define PREFETCHW "prefetcht0" #else -#define PREFETCH "/nop" -#define PREFETCHW "/nop" +#define PREFETCH " # nop" +#define PREFETCHW " # nop" #endif #ifdef HAVE_MMX2 #define SFENCE "sfence" #else -#define SFENCE "/nop" +#define SFENCE " # nop" #endif #ifdef HAVE_MMX2 |