diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 13:49:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 14:24:28 +0100 |
| commit | 91c8921d807be9a3c542967a7cb99758a16b41fe (patch) | |
| tree | 2902904fce5876de769c895f768fd4b17b727fa4 /CREDITS | |
| parent | 6b2f7fd1c7285974898c31d48d477728a30199f9 (diff) | |
| parent | 71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46 (diff) | |
| download | ffmpeg-91c8921d807be9a3c542967a7cb99758a16b41fe.tar.gz | |
Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'
* commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46':
dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions