[FFmpeg-cvslog] Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 10:49:46 2013 +0200| [05599308e98895e3c9aa6c1c90a2086aa029c42e] | committer: Michael Niedermayer

Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'

* commit 'bf7c3c6b157f7938578f964b62cffd5e504940be':
  x86: dsputil: Move cavs and vc1-specific functions where they belong

Conflicts:
	libavcodec/x86/dsputil_mmx.c

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

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