[FFmpeg-cvslog] x86: hpeldsp: Don' t check for bitexact flag when initializing VP3-specific code
Diego Biurrun
git at videolan.org
Tue Jan 31 20:12:20 EET 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jan 19 17:55:59 2016 +0100| [0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553] | committer: Diego Biurrun
x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code
That code is only ever initialized with that flag set.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553
---
libavcodec/x86/hpeldsp.h | 2 +-
libavcodec/x86/hpeldsp_init.c | 2 +-
libavcodec/x86/hpeldsp_vp3_init.c | 14 +++++---------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/libavcodec/x86/hpeldsp.h b/libavcodec/x86/hpeldsp.h
index d624ed9..566e518 100644
--- a/libavcodec/x86/hpeldsp.h
+++ b/libavcodec/x86/hpeldsp.h
@@ -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 */
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index cd3999e..6a8d420 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -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);
}
diff --git a/libavcodec/x86/hpeldsp_vp3_init.c b/libavcodec/x86/hpeldsp_vp3_init.c
index 2510c11..cc1f5e4 100644
--- a/libavcodec/x86/hpeldsp_vp3_init.c
+++ b/libavcodec/x86/hpeldsp_vp3_init.c
@@ -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;
}
}
More information about the ffmpeg-cvslog
mailing list