aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-10-29 16:55:14 +0200
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-17 23:11:34 +0100
commit346fa70bb88ac83879c9d9f1aa8a282c4190d4a7 (patch)
tree0e1b1522e192fc37c8ae9dc467bcb17b920902ab
parente92f585bd90ede07a252113ba4bf8e79cd5852de (diff)
downloadffmpeg-346fa70bb88ac83879c9d9f1aa8a282c4190d4a7.tar.gz
doc: fix spelling errors
Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 1e660fe88d2dd8fdcb0136b4cee3152f61ebc6c5) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--doc/filters.texi2
-rw-r--r--doc/formats.texi2
-rw-r--r--libavcodec/4xm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index c37fa295ce..1ebf251862 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -9665,7 +9665,7 @@ Scene change detection method. Scene change leads motion vectors to be in random
@item none
Disable scene change detection.
@item fdiff
-Frame difference. Corresponding pixel values are compared and if it statisfies @var{scd_threshold} scene change is detected.
+Frame difference. Corresponding pixel values are compared and if it satisfies @var{scd_threshold} scene change is detected.
@end table
Default method is @samp{fdiff}.
diff --git a/doc/formats.texi b/doc/formats.texi
index 5ef7fada0d..87704afb6c 100644
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -63,7 +63,7 @@ This ensures that file and data checksums are reproducible and match between
platforms. Its primary use is for regression testing.
@item shortest
Stop muxing at the end of the shortest stream.
-It may be needed to increase max_interleave_delta to avoid flusing the longer
+It may be needed to increase max_interleave_delta to avoid flushing the longer
streams before EOF.
@end table
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index a7a757a078..5547dfd87f 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -532,7 +532,7 @@ static int decode_i_block(FourXContext *f, int16_t *block)
}
i += code >> 4;
if (i >= 64) {
- av_log(f->avctx, AV_LOG_ERROR, "run %d oveflow\n", i);
+ av_log(f->avctx, AV_LOG_ERROR, "run %d overflow\n", i);
return 0;
}