[FFmpeg-cvslog] Merge commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 16 00:44:20 2013 +0200| [d5c31403aa13a1300fa97daba307675e2107fcfa] | committer: Michael Niedermayer

Merge commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3'

* commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3':
  x86: Move constants to the only place where they are used

Conflicts:
	libavcodec/x86/vp3dsp.asm

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

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