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

That code is only ever initialized with that flag set.

Diego Biurrun committed 10 years ago

Commit 0a39c9a1 parent 95c1df93 files · +7 −11Browse files

Unified · Split

3 files

@@ -37,6 +37,6 @@ void ff_put_pixels8_xy2_mmx(uint8_t block, const uint8_t pixels, · 36 unmodified lines
37	37	void ff_put_pixels16_xy2_mmx(uint8_t block, const uint8_t pixels,
38	38	ptrdiff_t line_size, int h);
39	39
40		−void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags, int flags);
	40	+void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags);
41	41
42	42	#endif /* AVCODEC_X86_HPELDSP_H */

@@ -255,5 +255,5 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags) · 254 unmodified lines
255	255	hpeldsp_init_sse2_fast(c, flags);
256	256
257	257	if (CONFIG_VP3_DECODER)
258		− ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags);
	258	+ ff_hpeldsp_vp3_init_x86(c, cpu_flags);
259	259	}

@@ -38,19 +38,15 @@ void ff_put_no_rnd_pixels8_y2_exact_3dnow(uint8_t *block, · 37 unmodified lines
38	38	const uint8_t *pixels,
39	39	ptrdiff_t line_size, int h);
40	40
41		−av_cold void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags, int flags)
	41	+av_cold void ff_hpeldsp_vp3_init_x86(HpelDSPContext *c, int cpu_flags)
42	42	{
43	43	if (EXTERNAL_AMD3DNOW(cpu_flags)) {
44		− if (flags & AV_CODEC_FLAG_BITEXACT) {
45		− c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow;
46		− c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow;
47		− }
	44	+ c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow;
	45	+ c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow;
48	46	}
49	47
50	48	if (EXTERNAL_MMXEXT(cpu_flags)) {
51		− if (flags & AV_CODEC_FLAG_BITEXACT) {
52		− c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext;
53		− c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext;
54		− }
	49	+ c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext;
	50	+ c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext;
55	51	}
56	52	}

Keyboard shortcuts