Merge commit 'f4f27e4cf1013c55b2c7df359ce8d58ee922662c'

[ffmpeg] / doc / encoders.texi

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 0a38102de1ad0c34e7bc496f6d93f0d9c66295b6..258852cc0f974336ba2baa8af347ef1351fe2e91 100644 (file)
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -130,15 +130,14 @@ The default, AAC "Low-complexity" profile. Is the most compatible and produces
 decent quality.
 
 @item mpeg2_aac_low
-This profile disables aac_is and aac_pns which were introduced with the MPEG4
-specifications and could cause incompatibility with very old devices. Will
-reduce quality and is therefore not recommended unless necessary.
+Equivalent to -profile:a aac_low -aac_pns 0. PNS was introduced with the MPEG4
+specifications.
 
 @item aac_ltp
 Long term prediction profile, is enabled by and will enable the aac_ltp option.
 Introduced in MPEG4.
 
-@item aac_ltp
+@item aac_pred
 Main-type prediction profile, is enabled by and will enable the aac_pred option.
 Introduced in MPEG2.
 
@@ -1424,7 +1423,9 @@ a fixed number of slices
 @item rowmb
 one slice per row of macroblocks
 @item auto
-automatic number of slices according to number of thread
+automatic number of slices according to number of threads
+@item dyn
+dynamic slicing
 @end table
 
 Default value is @samp{auto}.
@@ -1436,6 +1437,12 @@ set a value of 0.
 @item profile
 Set profile restrictions. If set to the value of @samp{main} enable
 CABAC (set the @code{SEncParamExt.iEntropyCodingModeFlag} flag to 1).
+
+@item max_nal_size
+Set maximum NAL size in bytes.
+
+@item allow_skip_frames
+Allow skipping frames to hit the target bitrate if set to 1.
 @end table
 
 @section jpeg2000