diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-04-13 10:15:04 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-04-13 10:15:04 +0000 |
| commit | 241c55aabe3dfeef2caf413bb2ec37504f488056 (patch) | |
| tree | 4d4600916f0f024d16972b7af7a7988fc103e711 /libswscale | |
| parent | 030896c76a74dcfeed0b6eb88d5389fe9238aae3 (diff) | |
Merge fix for GPL code that erroneously made it into the LGPL build.
Originally committed as revision 18490 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index 3262b6ee85..6f2e243052 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2219,7 +2219,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth, } else // fast bilinear upscale / crap downscale { -#if ARCH_X86 +#if ARCH_X86 && CONFIG_GPL #if HAVE_MMX2 int i; #if defined(PIC) @@ -2492,7 +2492,7 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth, } else // fast bilinear upscale / crap downscale { -#if ARCH_X86 +#if ARCH_X86 && CONFIG_GPL #if HAVE_MMX2 int i; #if defined(PIC) |