[FFmpeg-cvslog] Redefine sameq

Lou Logan git at videolan.org
Tue Apr 5 03:25:11 CEST 2011


ffmpeg | branch: master | Lou Logan <lou at fakeoutdoorsman.com> | Mon Mar 28 12:13:44 2011 -0800| [8af3167bb6d32379c5575c67a5b88c82d5019cb4] | committer: Michael Niedermayer

Redefine sameq

I think the documentation of sameq is causing confusion and misuse of
this option.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 doc/ffmpeg.texi |    2 +-
 ffmpeg.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 222cfec..18b6d65 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 72313a3..dc8e1b7 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},



More information about the ffmpeg-cvslog mailing list