aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/snowdsp.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-04-19 09:56:01 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-04-19 09:56:01 +0200
commitb38910c9790253b362839042a17e13252c1d4b90 (patch)
treee0914971cbc660f5bf96de7f4a77b7d5db7f4111 /libavcodec/x86/snowdsp.c
parent72c93abaad708c013fd407a0c2e8288ebd9285d1 (diff)
downloadffmpeg-b38910c9790253b362839042a17e13252c1d4b90.tar.gz
Fix compilation with !HAVE_6REGS.
Can be tested with: $ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
Diffstat (limited to 'libavcodec/x86/snowdsp.c')
-rw-r--r--libavcodec/x86/snowdsp.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c
index 711af5fd54..67cb868ada 100644
--- a/libavcodec/x86/snowdsp.c
+++ b/libavcodec/x86/snowdsp.c
@@ -606,6 +606,7 @@ static void ff_snow_vertical_compose97i_mmx(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM
}
#endif //HAVE_7REGS
+#if HAVE_6REGS
#define snow_inner_add_yblock_sse2_header \
IDWTELEM * * dst_array = sb->line + src_y;\
x86_reg tmp;\
@@ -873,6 +874,7 @@ static void ff_snow_inner_add_yblock_mmx(const uint8_t *obmc, const int obmc_str
else
ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
}
+#endif /* HAVE_6REGS */
#endif /* HAVE_INLINE_ASM */
@@ -887,7 +889,9 @@ void ff_dwt_init_x86(SnowDWTContext *c)
#if HAVE_7REGS
c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
#endif
+#if HAVE_6REGS
c->inner_add_yblock = ff_snow_inner_add_yblock_sse2;
+#endif
}
else{
if (mm_flags & AV_CPU_FLAG_MMXEXT) {
@@ -896,7 +900,9 @@ void ff_dwt_init_x86(SnowDWTContext *c)
c->vertical_compose97i = ff_snow_vertical_compose97i_mmx;
#endif
}
+#if HAVE_6REGS
c->inner_add_yblock = ff_snow_inner_add_yblock_mmx;
+#endif
}
}
#endif /* HAVE_INLINE_ASM */