diff options
Diffstat (limited to 'contrib/ffmpeg/libswscale/rgb2rgb.c')
| -rw-r--r-- | contrib/ffmpeg/libswscale/rgb2rgb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ffmpeg/libswscale/rgb2rgb.c b/contrib/ffmpeg/libswscale/rgb2rgb.c index 2bb5d3355..a938abfc9 100644 --- a/contrib/ffmpeg/libswscale/rgb2rgb.c +++ b/contrib/ffmpeg/libswscale/rgb2rgb.c @@ -91,7 +91,7 @@ void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *sr long srcStride1, long srcStride2, long srcStride3, long dstStride); -#if defined(ARCH_X86) +#if defined(ARCH_X86) && defined(CONFIG_GPL) static const uint64_t mmx_null __attribute__((aligned(8))) = 0x0000000000000000ULL; static const uint64_t mmx_one __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL; static const uint64_t mask32b attribute_used __attribute__((aligned(8))) = 0x000000FF000000FFULL; @@ -175,7 +175,7 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={ #define RENAME(a) a ## _C #include "rgb2rgb_template.c" -#if defined(ARCH_X86) +#if defined(ARCH_X86) && defined(CONFIG_GPL) //MMX versions #undef RENAME @@ -214,7 +214,7 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={ */ void sws_rgb2rgb_init(int flags){ -#if defined(HAVE_MMX2) || defined(HAVE_3DNOW) || defined(HAVE_MMX) +#if (defined(HAVE_MMX2) || defined(HAVE_3DNOW) || defined(HAVE_MMX)) && defined(CONFIG_GPL) if(flags & SWS_CPU_CAPS_MMX2){ rgb15to16= rgb15to16_MMX2; rgb15to24= rgb15to24_MMX2; @@ -341,7 +341,7 @@ void sws_rgb2rgb_init(int flags){ } /** - * Pallete is assumed to contain bgr32 + * Palette is assumed to contain BGR32. */ void palette8torgb32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) { @@ -391,7 +391,7 @@ void palette8tobgr32(const uint8_t *src, uint8_t *dst, long num_pixels, const ui } /** - * Pallete is assumed to contain bgr32 + * Palette is assumed to contain BGR32. */ void palette8torgb24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) { @@ -446,7 +446,7 @@ void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const ui } /** - * Pallete is assumed to contain bgr15, see rgb32to15 to convert the palette + * Palette is assumed to contain BGR15, see rgb32to15 to convert the palette. */ void palette8torgb15(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) { |