[FFmpeg-cvslog] Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 13:55:23 2013 +0200| [bf18810a215c1313ba868c59a0f778aff01616c1] | committer: Michael Niedermayer

Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'

* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
  x86: rnd_template: Eliminate pointless OP_AVG macro indirection

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

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