[FFmpeg-cvslog] Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  9 11:01:14 2013 +0200| [3469c24a1084f677b407bb9fd4099d7a6b6bbc6c] | committer: Michael Niedermayer

Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'

* commit '87614667606b42476f9017d79faf12b45a0bd77c':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
	libavcodec/x86/lpc.c

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

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