[FFmpeg-cvslog] avcodec: Fix a typo in an option description

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Fri Dec  7 16:15:37 2012 +0100| [4ed0c35c40b7be19d892f48c35743a642757ac87] | committer: Clément Bœsch

avcodec: Fix a typo in an option description

Signed-off-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Clément Bœsch <ubitux at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ed0c35c40b7be19d892f48c35743a642757ac87
---

 doc/ffmpeg-codecs.texi     |    2 +-
 libavcodec/options_table.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ffmpeg-codecs.texi b/doc/ffmpeg-codecs.texi
index ba31a21..0bbf716 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 1ae93c1..7ce8216 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},