Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 13:01:40 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 13:22:05 +0000 (14:22 +0100)
commit81a11452f8e0b486299905601460d6d2f7eaa548
tree1c9a708d0c77e77c930385ed95ee82601b0bdfd0
parenta8864615e6cc0bb202d9a269dbccbc7442232fe3
parentbf6b3ec924b4fb64d14df33077f4d4541d525dbf
Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bit_depth_template.c
libavcodec/dsputil.h
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/qpel.c
libavcodec/vc1dsp.c
libavcodec/vp3dsp.c