avformat: Remove remnants of side data merging

[ffmpeg] / doc / formats.texi

diff --git a/doc/formats.texi b/doc/formats.texi
index 52a5ff83711ec31244b549cabb02d6be5f57ff71..9387f98b6ac8a71563e213b554d8ef0d8ef06a89 100644 (file)
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -27,6 +27,10 @@ stream information. A higher value will enable detecting more
 information in case it is dispersed into the stream, but will increase
 latency. Must be an integer not lesser than 32. It is 5000000 by default.
 
+@item max_probe_packets @var{integer} (@emph{input})
+Set the maximum number of buffered packets when probing a codec.
+Default is 2500 packets.
+
 @item packetsize @var{integer} (@emph{output})
 Set packet size.
 
@@ -45,7 +49,6 @@ Generate missing PTS if DTS is present.
 Ignore DTS if PTS is set. Inert when nofillin is set.
 @item ignidx
 Ignore index.
-@item keepside (@emph{deprecated},@emph{inert})
 @item nobuffer
 Reduce the latency introduced by buffering during initial input streams analysis.
 @item nofillin
@@ -139,7 +142,7 @@ Consider things that a sane encoder should not do as an error.
 
 @item max_interleave_delta @var{integer} (@emph{output})
 Set maximum buffering duration for interleaving. The duration is
-expressed in microseconds, and defaults to 1000000 (1 second).
+expressed in microseconds, and defaults to 10000000 (10 seconds).
 
 To ensure all the streams are interleaved correctly, libavformat will
 wait until it has at least one packet for each stream before actually
@@ -224,6 +227,28 @@ would require too many resources due to a large number of streams.
 @item skip_estimate_duration_from_pts @var{bool} (@emph{input})
 Skip estimation of input duration when calculated using PTS.
 At present, applicable for MPEG-PS and MPEG-TS.
+
+@item strict, f_strict @var{integer} (@emph{input/output})
+Specify how strictly to follow the standards. @code{f_strict} is deprecated and
+should be used only via the @command{ffmpeg} tool.
+
+Possible values:
+@table @samp
+@item very
+strictly conform to an older more strict version of the spec or reference software
+@item strict
+strictly conform to all the things in the spec no matter what consequences
+@item normal
+
+@item unofficial
+allow unofficial extensions
+@item experimental
+allow non standardized experimental things, experimental
+(unfinished/work in progress/not well tested) decoders and encoders.
+Note: experimental decoders can pose a security risk, do not use this for
+decoding untrusted input.
+@end table
+
 @end table
 
 @c man end FORMAT OPTIONS
@@ -234,30 +259,10 @@ At present, applicable for MPEG-PS and MPEG-TS.
 Format stream specifiers allow selection of one or more streams that
 match specific properties.
 
-Possible forms of stream specifiers are:
-@table @option
-@item @var{stream_index}
-Matches the stream with this index.
-
-@item @var{stream_type}[:@var{stream_index}]
-@var{stream_type} is one of following: 'v' for video, 'a' for audio,
-'s' for subtitle, 'd' for data, and 't' for attachments. If
-@var{stream_index} is given, then it matches the stream number
-@var{stream_index} of this type. Otherwise, it matches all streams of
-this type.
-
-@item p:@var{program_id}[:@var{stream_index}]
-If @var{stream_index} is given, then it matches the stream with number
-@var{stream_index} in the program with the id
-@var{program_id}. Otherwise, it matches all streams in the program.
-
-@item #@var{stream_id}
-Matches the stream by a format-specific ID.
-@end table
-
 The exact semantics of stream specifiers is defined by the
 @code{avformat_match_stream_specifier()} function declared in the
-@file{libavformat/avformat.h} header.
+@file{libavformat/avformat.h} header and documented in the
+@ref{Stream specifiers,,Stream specifiers section in the ffmpeg(1) manual,ffmpeg}.
 
 @ifclear config-writeonly
 @include demuxers.texi