aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-12-07 16:15:37 +0100
committerClément Bœsch <ubitux@gmail.com>2012-12-07 16:16:20 +0100
commit4ed0c35c40b7be19d892f48c35743a642757ac87 (patch)
tree61d3a01f966d993919bc295beef796fc77d182de
parent1c779854b52972e48d87bf6fed0b9f6fbf7a9af3 (diff)
downloadffmpeg-4ed0c35c40b7be19d892f48c35743a642757ac87.tar.gz
avcodec: Fix a typo in an option description
Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Clément Bœsch <ubitux@gmail.com>
-rw-r--r--doc/ffmpeg-codecs.texi2
-rw-r--r--libavcodec/options_table.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg-codecs.texi b/doc/ffmpeg-codecs.texi
index ba31a2125f..0bbf716057 100644
--- a/doc/ffmpeg-codecs.texi
+++ b/doc/ffmpeg-codecs.texi
@@ -823,7 +823,7 @@ detect a good number of threads
@end table
@item me_threshold @var{integer} (@emph{encoding,video})
-Set motion estimaton threshold.
+Set motion estimation threshold.
@item mb_threshold @var{integer} (@emph{encoding,video})
Set macroblock threshold.
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 1ae93c1901..7ce82165fa 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -315,7 +315,7 @@ static const AVOption options[]={
#endif
{"threads", NULL, OFFSET(thread_count), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, INT_MAX, V|E|D, "threads"},
{"auto", "detect a good number of threads", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, V|E|D, "threads"},
-{"me_threshold", "motion estimaton threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
+{"me_threshold", "motion estimation threshold", OFFSET(me_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
{"mb_threshold", "macroblock threshold", OFFSET(mb_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
{"dc", "intra_dc_precision", OFFSET(intra_dc_precision), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, V|E},
{"nssew", "nsse weight", OFFSET(nsse_weight), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E},