[FFmpeg-cvslog] Merge commit '932806232108872655556100011fe369125805d3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 10:43:52 2013 +0200| [35ef98013dfc8b9c4c4c3d6e87ff235b02cf71bc] | committer: Michael Niedermayer

Merge commit '932806232108872655556100011fe369125805d3'

* commit '932806232108872655556100011fe369125805d3':
  x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
  x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c

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

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