diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:28:58 +0100 |
| commit | af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e (patch) | |
| tree | f093e566a4985317a2dc7d9f3f5df38599142720 /libavcodec/arm | |
| parent | 80a9297b711b7acb152ebbf84b28772945f920ea (diff) | |
| parent | 523c7bd23c781aa0f3a85044896f5e18e8b52534 (diff) | |
| download | ffmpeg-af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e.tar.gz | |
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
misc typo, style and wording fixes
Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/fmtconvert_vfp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/fmtconvert_vfp.S b/libavcodec/arm/fmtconvert_vfp.S index 4bdbe82e52..7b012bc8d8 100644 --- a/libavcodec/arm/fmtconvert_vfp.S +++ b/libavcodec/arm/fmtconvert_vfp.S @@ -25,7 +25,7 @@ * ARM VFP optimized float to int16 conversion. * Assume that len is a positive number and is multiple of 8, destination * buffer is at least 4 bytes aligned (8 bytes alignment is better for - * performance), little endian byte sex + * performance), little-endian byte sex. */ @ void ff_float_to_int16_vfp(int16_t *dst, const float *src, int len) function ff_float_to_int16_vfp, export=1 |