]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 398b9ed c46819f)
Merge commit 'c46819f2299c73cd1bfa8ef04d08b0153a5699d3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Apr 2013 22:44:20 +0000 (00:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Apr 2013 22:44:20 +0000 (00:44 +0200)
* 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>
1  2 
libavcodec/x86/vp3dsp.asm patch | diff1 | diff2 | blob | history

diff --cc libavcodec/x86/vp3dsp.asm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.