summaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:32:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-21 17:32:52 +0100
commitd27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch)
treeb43acbce10229c375ac3b21c80a6c2c09354da8d /libavresample
parenta41bf09d9c56215448f14fb086c9f882eb41ecac (diff)
parent511cf612ac979f536fd65e14603a87ca5ad435f3 (diff)
downloadffmpeg-streaming-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.zip
ffmpeg-streaming-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.tar.gz
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/avresample-test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c
index ab49e48..81e9bf0 100644
--- a/libavresample/avresample-test.c
+++ b/libavresample/avresample-test.c
@@ -100,7 +100,7 @@ static void audiogen(AVLFG *rnd, void **data, enum AVSampleFormat sample_fmt,
a += M_PI * 1000.0 * 2.0 / sample_rate;
}
- /* 1 second of varing frequency between 100 and 10000 Hz */
+ /* 1 second of varying frequency between 100 and 10000 Hz */
a = 0;
for (i = 0; i < 1 * sample_rate && k < nb_samples; i++, k++) {
v = sin(a) * 0.30;
OpenPOWER on IntegriCloud