* commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3': x86: Move constants to the only place where they are used Conflicts: libavcodec/x86/vp3dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>