summaryrefslogtreecommitdiff
path: root/doc/encoders.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 15:26:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 15:26:04 +0200
commit560e9365b6eb6ce34eddea1a582047e09022fcb0 (patch)
treef5c100558cf72518d6b6939aeff8d371d52468e7 /doc/encoders.texi
parent5dd8ca7d1b5401d5bfe078f4129db199fe317ad5 (diff)
parentbc54c2ae3ca6abd225dc331eafc12108513158de (diff)
Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de': libx264: add shortcut for the bluray compatibility option Conflicts: doc/encoders.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/encoders.texi')
-rw-r--r--doc/encoders.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi
index 727549f1b1..585eae67c9 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1079,6 +1079,10 @@ Enable calculation and printing SSIM stats after the encoding.
Enable the use of Periodic Intra Refresh instead of IDR frames when set
to 1.
+@item bluray-compat (@emph{bluray-compat})
+Configure the encoder to be compatible with the bluray standard.
+It is a shorthand for setting "bluray-compat=1 force-cfr=1".
+
@item b-bias (@emph{b-bias})
Set the influence on how often B-frames are used.