diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:01:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:01:30 +0100 |
| commit | 4104eb44e629d1469918e73587649fd3b2d992ba (patch) | |
| tree | 483dacda734e81247a01f747dea59f93c5f452db /libswscale/x86/scale.asm | |
| parent | a9b1936a4e46137c80c4c8300cfc68ca2a317b90 (diff) | |
| parent | 55519926ef855c671d084ccc151056de9e3d3a77 (diff) | |
| download | ffmpeg-4104eb44e629d1469918e73587649fd3b2d992ba.tar.gz | |
Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'
* commit '55519926ef855c671d084ccc151056de9e3d3a77':
x86: Make function prototype comments in assembly code consistent
Conflicts:
libavcodec/x86/sbrdsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/scale.asm')
0 files changed, 0 insertions, 0 deletions