diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:11:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:12:11 +0200 |
| commit | 46ad2d9e446304e00f44760da5abd66f5117b4fa (patch) | |
| tree | f41cbe98d569fc5801aef45ec87ef5541c22515c /tests | |
| parent | 5dc2c99055ae4a95336f28c58c8c8da4033979f1 (diff) | |
| parent | 03039f4c8cdb4f8e5dc69905f3d73e2a531157e8 (diff) | |
| download | ffmpeg-46ad2d9e446304e00f44760da5abd66f5117b4fa.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/audiogen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/audiogen.c b/tests/audiogen.c index 09cf429a71..e705061008 100644 --- a/tests/audiogen.c +++ b/tests/audiogen.c @@ -48,7 +48,7 @@ static unsigned int myrnd(unsigned int *seed_ptr, int n) #define COS_TABLE_BITS 7 -/* integer cosinus */ +/* integer cosine */ static const unsigned short cos_table[(1 << COS_TABLE_BITS) + 2] = { 0x8000, 0x7ffe, 0x7ff6, 0x7fea, 0x7fd9, 0x7fc2, 0x7fa7, 0x7f87, 0x7f62, 0x7f38, 0x7f0a, 0x7ed6, 0x7e9d, 0x7e60, 0x7e1e, 0x7dd6, @@ -180,7 +180,7 @@ int main(int argc, char **argv) if ((ext = strrchr(argv[1], '.')) != NULL && !strcmp(ext, ".wav")) put_wav_header(sample_rate, nb_channels, 6 * sample_rate); - /* 1 second of single freq sinus at 1000 Hz */ + /* 1 second of single freq sine at 1000 Hz */ a = 0; for (i = 0; i < 1 * sample_rate; i++) { v = (int_cos(a) * 10000) >> FRAC_BITS; |