diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-19 13:47:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-19 14:17:51 +0200 |
| commit | c91a798a2c3600bc30cb1915eb26774f64b7e133 (patch) | |
| tree | 881da056c867695fae88549474a6d8bd9acd43ab /libavcodec/x86/snowdsp.c | |
| parent | e8fc91e22a608eecccdeb612f91a0998e486426d (diff) | |
| parent | b38910c9790253b362839042a17e13252c1d4b90 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with !HAVE_6REGS.
Use MANGLE in cavsdsp.c to save two registers using gcc.
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/x86/snowdsp.c')
| -rw-r--r-- | libavcodec/x86/snowdsp.c | 6 |
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 */ |