[FFmpeg-cvslog] Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 14:01:06 2013 +0200| [2f9ef60c97657e5fa47d5f17c5e4714efb672e4e] | committer: Michael Niedermayer

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
  x86: dsputil hpeldsp: Move shared template functions into separate object

Conflicts:
	libavcodec/x86/Makefile

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

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