[FFmpeg-cvslog] Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 14 10:55:28 2013 +0200| [b2da63db507b88743edb6bf6675aaf4f9f59edb1] | committer: Michael Niedermayer

Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'

* commit '245b76a108585b6fb52eebc2626c472d6fa530dc':
  x86: dsputil: Split inline assembly from init code

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Note, the author attribution is left in place and not removed
as it is in the merged commit.

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

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