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@gmx.at>
pull/14/head
Michael Niedermayer 12 years ago
commit d5c31403aa
  1. 2
      libavcodec/x86/vp3dsp.asm

@ -33,7 +33,7 @@ vp3_idct_data: times 8 dw 64277
times 8 dw 25080
times 8 dw 12785
pb_7: times 8 db 7
pb_7: times 8 db 0x07
pb_1F: times 8 db 0x1f
pb_81: times 8 db 0x81

Loading…
Cancel
Save