Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'

* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf':
  dsputil: Move rnd_avg inline functions to a separate header

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

diff --cc libavcodec/bit_depth_template.c
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/sh4/dsputil_align.c
Simple merge

diff --cc libavcodec/sh4/qpel.c
Simple merge

diff --cc libavcodec/vc1dsp.c
index 7ad63afd7842513620c13033c9d79c0b5042502b,99ede18df79265cb2f401a5508ef605648053307..260eda401bf5bdcb3baaac0c2e04b436a6dbe788
--- 1/libavcodec/vc1dsp.c
--- 2/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@@ -25,9 -25,8 +25,10 @@@
   *
   */
  
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "h264chroma.h"
++#include "rnd_avg.h"
  #include "vc1dsp.h"
  
  

diff --cc libavcodec/vp3dsp.c
Simple merge