diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:08:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:08:49 +0100 |
| commit | 4b874fc4fc2739db7a907ce430ac862e625b7387 (patch) | |
| tree | f3e116c3be4782c51b3843daa06dcb754e24ce27 /ffserver.c | |
| parent | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (diff) | |
| parent | a65bdceb060628881578afb29df4eb222421381f (diff) | |
| download | ffmpeg-4b874fc4fc2739db7a907ce430ac862e625b7387.tar.gz | |
Merge commit 'a65bdceb060628881578afb29df4eb222421381f'
* commit 'a65bdceb060628881578afb29df4eb222421381f':
x86: mmx2 ---> mmxext in variable names
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions