diff --git a/README.md b/README.md index d567068e..ad084259 100644 --- a/README.md +++ b/README.md @@ -120,10 +120,10 @@ Video structure: (e.g. lp-g8d4t2, see README) --(no-)open-gop : Use open GOP configuration. [enabled] --cqmfile : Read custom quantization matrices from a file. - --scaling-list : Set scaling list mode. [off]\n" - - off: Disable scaling lists.\n" - - custom: use custom list (with --cqmfile).\n" - - default: Use default lists.\n" + --scaling-list : Set scaling list mode. [off] + - off: Disable scaling lists. + - custom: use custom list (with --cqmfile). + - default: Use default lists. --bitrate : Target bitrate [0] - 0: Disable rate control. - N: Target N bits per second. @@ -212,10 +212,10 @@ Compression tools: For rd=0..1: Try the first candidate. For rd=2.. : Try the best candidate based on luma satd cost. [enabled] + --max-merge : Maximum number of merge candidates, 1..5 [5] --(no-)implicit-rdpcm : Implicit residual DPCM. Currently only supported with lossless coding. [disabled] --(no-)tmvp : Temporal motion vector prediction [enabled] - --max-merge : Maximum number of merge candidates, 1..5 [5] Parallel processing: --threads : Number of threads to use [auto] diff --git a/doc/kvazaar.1 b/doc/kvazaar.1 index 773d91c9..70323d3a 100644 --- a/doc/kvazaar.1 +++ b/doc/kvazaar.1 @@ -285,6 +285,9 @@ For rd=0..1: Try the first candidate. For rd=2.. : Try the best candidate based on luma satd cost. [enabled] .TP +\fB\-\-max\-merge +Maximum number of merge candidates, 1..5 [5] +.TP \fB\-\-(no\-)implicit\-rdpcm Implicit residual DPCM. Currently only supported with lossless coding. [disabled]