Browse Source

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
tags/v0.5.1
Diego Biurrun 17 years ago
parent
commit
241c55aabe
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libswscale/swscale_template.c

+ 2
- 2
libswscale/swscale_template.c View File

@@ -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)


Loading…
Cancel
Save