[FFmpeg-cvslog] Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  9 14:01:40 2013 +0100| [81a11452f8e0b486299905601460d6d2f7eaa548] | committer: Michael Niedermayer

Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'

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

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

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