Merge commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Jan 2017 17:59:29 +0000 (14:59 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Jan 2017 17:59:29 +0000 (14:59 -0300)
* commit '0a39c9ac0bfd7345fe676b4e2707d9cec3cbb553':
  x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/x86/hpeldsp.h
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_vp3_init.c

@@@ -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 */
@@@ -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);
  }
Simple merge