diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 00:44:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 00:44:20 +0200 |
| commit | d5c31403aa13a1300fa97daba307675e2107fcfa (patch) | |
| tree | 8bf13051922292b8f70d93c4843a5a89b0d67b45 /libavcodec | |
| parent | 398b9ed28f589999e6135b367ef0180944159db6 (diff) | |
| parent | c46819f2299c73cd1bfa8ef04d08b0153a5699d3 (diff) | |
| download | ffmpeg-streaming-d5c31403aa13a1300fa97daba307675e2107fcfa.zip ffmpeg-streaming-d5c31403aa13a1300fa97daba307675e2107fcfa.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/vp3dsp.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm index a47b8f2..24496ae 100644 --- a/libavcodec/x86/vp3dsp.asm +++ b/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 |
