x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code

That code is only ever initialized with that flag set.
This commit is contained in:
Diego Biurrun 2016-01-19 17:55:59 +01:00
parent 95c1df929b
commit 0a39c9ac0b
3 changed files with 7 additions and 11 deletions

View File

@ -37,6 +37,6 @@ void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags, int flags);
void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags);
#endif /* AVCODEC_X86_HPELDSP_H */

View File

@ -255,5 +255,5 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
hpeldsp_init_sse2_fast(c, flags);
if (CONFIG_VP3_DECODER)
ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags);
ff_hpeldsp_vp3_init_x86(c, cpu_flags);
}

View File

@ -38,19 +38,15 @@ void ff_put_no_rnd_pixels8_y2_exact_3dnow(uint8_t *block,
const uint8_t *pixels,
ptrdiff_t line_size, int h);
av_cold void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags, int flags)
av_cold void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags)
{
if (EXTERNAL_AMD3DNOW(cpu_flags)) {
if (flags & AV_CODEC_FLAG_BITEXACT) {
c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow;
c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow;
}
c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow;
c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow;
}
if (EXTERNAL_MMXEXT(cpu_flags)) {
if (flags & AV_CODEC_FLAG_BITEXACT) {
c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext;
c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext;
}
c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext;
c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext;
}
}