Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'

* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
  ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/hpeldsp.h
	libavcodec/ppc/hpeldsp_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/hpeldsp.c
index 512767492d2f6136739b4ab24b3b0b06bbeabbbe,09e457677408928e431f348b487b7c559351c87f..2c2d298cd2b678f65c90ecdd2103d2a9051cf8d6
--- 1/libavcodec/hpeldsp.c
--- 2/libavcodec/hpeldsp.c
+++ b/libavcodec/hpeldsp.c
@@@ -54,12 -54,8 +54,14 @@@ av_cold void ff_hpeldsp_init(HpelDSPCon
      hpel_funcs(avg, [3],  2);
      hpel_funcs(avg_no_rnd,, 16);
  
+     if (ARCH_PPC)
+         ff_hpeldsp_init_ppc(c, flags);
      if (ARCH_X86)
          ff_hpeldsp_init_x86(c, flags);
 +    if (ARCH_ARM)        ff_hpeldsp_init_arm   (c, flags);
 +    if (HAVE_VIS)        ff_hpeldsp_init_vis   (c, flags);
 +    if (ARCH_ALPHA)      ff_hpeldsp_init_alpha (c, flags);
 +    if (ARCH_PPC)        ff_hpeldsp_init_ppc   (c, flags);
 +    if (ARCH_SH4)        ff_hpeldsp_init_sh4   (c, flags);
 +    if (ARCH_BFIN)       ff_hpeldsp_init_bfin  (c, flags);
  }

diff --cc libavcodec/ppc/hpeldsp_altivec.c
Simple merge