diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-04-18 12:47:16 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-04-18 12:47:16 +0200 |
| commit | 99818ac4d371729180686cae6ea2c5da0ee446e8 (patch) | |
| tree | d62218939d3f26fdff58d51f66e6baaa42b1dbe4 | |
| parent | ee94362c8a6ae70eb7f7c946729122f1b91a6b6c (diff) | |
| download | ffmpeg-99818ac4d371729180686cae6ea2c5da0ee446e8.tar.gz | |
Fix libswscale compilation with --disable-optimizations on x86-32.
Fixes ticket #2477.
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index 8998fea2d6..fd5b4b9c7d 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1610,6 +1610,7 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t * others are ignored in the C version. * FIXME: Write HQ version. */ +#if HAVE_7REGS static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int width, int height, int lumStride, int chromStride, int srcStride, @@ -1848,6 +1849,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_ ff_rgb24toyv12_c(src, ydst, udst, vdst, width, height-y, lumStride, chromStride, srcStride, rgb2yuv); } +#endif /* HAVE_7REGS */ #endif /* !COMPILE_TEMPLATE_SSE2 */ #if !COMPILE_TEMPLATE_AMD3DNOW @@ -2482,7 +2484,9 @@ static inline void RENAME(rgb2rgb_init)(void) #if COMPILE_TEMPLATE_MMXEXT || COMPILE_TEMPLATE_AMD3DNOW planar2x = RENAME(planar2x); #endif /* COMPILE_TEMPLATE_MMXEXT || COMPILE_TEMPLATE_AMD3DNOW */ +#if HAVE_7REGS ff_rgb24toyv12 = RENAME(rgb24toyv12); +#endif /* HAVE_7REGS */ yuyvtoyuv420 = RENAME(yuyvtoyuv420); uyvytoyuv420 = RENAME(uyvytoyuv420); |