[FFmpeg-cvslog] Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jan 31 14:59:29 2017 -0300| [a956164e1eb3418922cae949f02ad4035f013213] | committer: James Almer

Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a956164e1eb3418922cae949f02ad4035f013213
---

 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 bf97029..0ecc97a 100644
--- a/libavcodec/x86/hpeldsp.h
+++ b/libavcodec/x86/hpeldsp.h
@@ -52,6 +52,6 @@ void ff_put_pixels16_xy2_sse2(uint8_t *block, const uint8_t *pixels,
 void ff_put_pixels16_xy2_ssse3(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 58e27e3..e583bd9 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -309,5 +309,5 @@ av_cold void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
         hpeldsp_init_ssse3(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 5979f41..17fdd08 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;
     }
 }


======================================================================

diff --cc libavcodec/x86/hpeldsp.h
index bf97029,566e518..0ecc97a
--- a/libavcodec/x86/hpeldsp.h
+++ b/libavcodec/x86/hpeldsp.h
@@@ -43,15 -34,9 +43,15 @@@ void ff_avg_pixels16_xy2_ssse3(uint8_t 
  
  void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
                              ptrdiff_t line_size, int h);
 +void ff_put_pixels8_xy2_ssse3(uint8_t *block, const uint8_t *pixels,
 +                              ptrdiff_t line_size, int h);
  void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
                               ptrdiff_t line_size, int h);
 +void ff_put_pixels16_xy2_sse2(uint8_t *block, const uint8_t *pixels,
 +                              ptrdiff_t line_size, int h);
 +void ff_put_pixels16_xy2_ssse3(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 --cc libavcodec/x86/hpeldsp_init.c
index 58e27e3,6a8d420..e583bd9
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@@ -305,9 -254,6 +305,9 @@@ av_cold void ff_hpeldsp_init_x86(HpelDS
      if (EXTERNAL_SSE2_FAST(cpu_flags))
          hpeldsp_init_sse2_fast(c, flags);
  
 +    if (EXTERNAL_SSSE3(cpu_flags))
 +        hpeldsp_init_ssse3(c, flags);
 +
      if (CONFIG_VP3_DECODER)
-         ff_hpeldsp_vp3_init_x86(c, cpu_flags, flags);
+         ff_hpeldsp_vp3_init_x86(c, cpu_flags);
  }