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 /libavresample | |
| 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 'libavresample')
| -rw-r--r-- | libavresample/avresample-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c index 81e9bf0f50..697b4ba799 100644 --- a/libavresample/avresample-test.c +++ b/libavresample/avresample-test.c @@ -91,7 +91,7 @@ static void audiogen(AVLFG *rnd, void **data, enum AVSampleFormat sample_fmt, k = 0; - /* 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 && k < nb_samples; i++, k++) { v = sin(a) * 0.30; |