summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLou Logan <lou@fakeoutdoorsman.com>2011-03-28 12:13:44 -0800
committerMichael Niedermayer <michaelni@gmx.at>2011-04-05 03:21:36 +0200
commit8af3167bb6d32379c5575c67a5b88c82d5019cb4 (patch)
tree9e1b912c6ad8171443d263ec896ec1360f9f6e5d
parent30c6fefd013a579f455c230ca9b9b0f8fc68285a (diff)
Redefine sameq
I think the documentation of sameq is causing confusion and misuse of this option. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/ffmpeg.texi2
-rw-r--r--ffmpeg.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 222cfec576..18b6d65cf4 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -281,7 +281,7 @@ Set video buffer verifier buffer size (in bits).
Force video codec to @var{codec}. Use the @code{copy} special value to
tell that the raw codec data must be copied as is.
@item -sameq
-Use same video quality as source (implies VBR).
+Use same quantizer as source (implies VBR).
@item -pass @var{n}
Select the pass number (1 or 2). It is used to do two-pass
diff --git a/ffmpeg.c b/ffmpeg.c
index 72313a33fa..dc8e1b7512 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4335,7 +4335,7 @@ static const OptionDef options[] = {
{ "vcodec", HAS_ARG | OPT_VIDEO, {(void*)opt_video_codec}, "force video codec ('copy' to copy stream)", "codec" },
{ "me_threshold", HAS_ARG | OPT_FUNC2 | OPT_EXPERT | OPT_VIDEO, {(void*)opt_me_threshold}, "motion estimaton threshold", "threshold" },
{ "sameq", OPT_BOOL | OPT_VIDEO, {(void*)&same_quality},
- "use same video quality as source (implies VBR)" },
+ "use same quantizer as source (implies VBR)" },
{ "pass", HAS_ARG | OPT_VIDEO, {(void*)&opt_pass}, "select the pass number (1 or 2)", "n" },
{ "passlogfile", HAS_ARG | OPT_STRING | OPT_VIDEO, {(void*)&pass_logfilename_prefix}, "select two pass log file name prefix", "prefix" },
{ "deinterlace", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_deinterlace},