[FFmpeg-cvslog] Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  9 11:35:37 2013 +0200| [164899c6e8588c25a1b50d0a0ea285812c36e3d3] | committer: Michael Niedermayer

Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
  x86: dsputil: Move constant declarations into separate header

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=164899c6e8588c25a1b50d0a0ea285812c36e3d3
---