[FFmpeg-cvslog] Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 14:32:05 2013 +0200| [477641e9f8a711b65a463ea75a4167b7cfdc84a5] | committer: Michael Niedermayer

Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'

* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
	libavcodec/x86/Makefile

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

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