ffmpeg: Check that frames are user type before treating them as such

[ffmpeg] / doc / protocols.texi

diff --git a/doc/protocols.texi b/doc/protocols.texi
index f06546c6c1389290bd5f9e6d0125a8425219ffc6..eab4a6aff973648fadb7f390f4a64a38aa883f3c 100644 (file)
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1,10 +1,10 @@
 @chapter Protocols
 @c man begin PROTOCOLS
 
 @chapter Protocols
 @c man begin PROTOCOLS
 

-Protocols are configured elements in Libav which allow to access
+Protocols are configured elements in FFmpeg which allow to access

 resources which require the use of a particular protocol.
 
 resources which require the use of a particular protocol.
 

-When you configure your Libav build, all the supported protocols are
+When you configure your FFmpeg build, all the supported protocols are

 enabled by default. You can list all available ones using the
 configure option "--list-protocols".
 
 enabled by default. You can list all available ones using the
 configure option "--list-protocols".
 


@@ -52,10 +52,10 @@ resource to be concatenated, each one possibly specifying a distinct
 protocol.
 
 For example to read a sequence of files @file{split1.mpeg},
 protocol.
 
 For example to read a sequence of files @file{split1.mpeg},

-@file{split2.mpeg}, @file{split3.mpeg} with @file{avplay} use the
+@file{split2.mpeg}, @file{split3.mpeg} with @file{ffplay} use the

 command:
 @example
 command:
 @example

-avplay concat:split1.mpeg\|split2.mpeg\|split3.mpeg
+ffplay concat:split1.mpeg\|split2.mpeg\|split3.mpeg

 @end example
 
 Note that you may need to escape the character "|" which is special for
 @end example
 
 Note that you may need to escape the character "|" which is special for


@@ -67,7 +67,7 @@ File access protocol.
 
 Allow to read from or read to a file.
 
 
 Allow to read from or read to a file.
 

-For example to read from a file @file{input.mpeg} with @file{ffmpeg}
+For example to read from a file @file{input.mpeg} with @command{ffmpeg}

 use the command:
 @example
 ffmpeg -i file:input.mpeg output.mpeg
 use the command:
 @example
 ffmpeg -i file:input.mpeg output.mpeg


@@ -134,14 +134,14 @@ pipe (e.g. 0 for stdin, 1 for stdout, 2 for stderr).  If @var{number}
 is not specified, by default the stdout file descriptor will be used
 for writing, stdin for reading.
 
 is not specified, by default the stdout file descriptor will be used
 for writing, stdin for reading.
 

-For example to read from stdin with @file{ffmpeg}:
+For example to read from stdin with @command{ffmpeg}:

 @example
 cat test.wav | ffmpeg -i pipe:0
 # ...this is the same as...
 cat test.wav | ffmpeg -i pipe:
 @end example
 
 @example
 cat test.wav | ffmpeg -i pipe:0
 # ...this is the same as...
 cat test.wav | ffmpeg -i pipe:
 @end example
 

-For writing to stdout with @file{ffmpeg}:
+For writing to stdout with @command{ffmpeg}:

 @example
 ffmpeg -i test.wav -f avi pipe:1 | cat > test.avi
 # ...this is the same as...
 @example
 ffmpeg -i test.wav -f avi pipe:1 | cat > test.avi
 # ...this is the same as...


@@ -155,8 +155,8 @@ be seekable, so they will fail with the pipe output protocol.
 
 Real-Time Messaging Protocol.
 
 
 Real-Time Messaging Protocol.
 

-The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐
-dia content across a TCP/IP network.
+The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
+content across a TCP/IP network.

 
 The required syntax is:
 @example
 
 The required syntax is:
 @example


@@ -183,10 +183,10 @@ application specified in @var{app}, may be prefixed by "mp4:".
 
 @end table
 
 
 @end table
 

-For example to read with @file{avplay} a multimedia resource named
+For example to read with @file{ffplay} a multimedia resource named

 "sample" from the application "vod" from an RTMP server "myserver":
 @example
 "sample" from the application "vod" from an RTMP server "myserver":
 @example

-avplay rtmp://myserver/vod/sample
+ffplay rtmp://myserver/vod/sample

 @end example
 
 @section rtmp, rtmpe, rtmps, rtmpt, rtmpte
 @end example
 
 @section rtmp, rtmpe, rtmps, rtmpt, rtmpte


@@ -195,7 +195,7 @@ Real-Time Messaging Protocol and its variants supported through
 librtmp.
 
 Requires the presence of the librtmp headers and library during
 librtmp.
 
 Requires the presence of the librtmp headers and library during

-configuration. You need to explicitely configure the build with
+configuration. You need to explicitly configure the build with

 "--enable-librtmp". If enabled this will replace the native RTMP
 protocol.
 
 "--enable-librtmp". If enabled this will replace the native RTMP
 protocol.
 


@@ -219,14 +219,14 @@ meaning as specified for the RTMP native protocol.
 See the librtmp manual page (man 3 librtmp) for more information.
 
 For example, to stream a file in real-time to an RTMP server using
 See the librtmp manual page (man 3 librtmp) for more information.
 
 For example, to stream a file in real-time to an RTMP server using

-@file{ffmpeg}:
+@command{ffmpeg}:

 @example
 ffmpeg -re -i myfile -f flv rtmp://myserver/live/mystream
 @end example
 
 @example
 ffmpeg -re -i myfile -f flv rtmp://myserver/live/mystream
 @end example
 

-To play the same stream using @file{avplay}:
+To play the same stream using @file{ffplay}:

 @example
 @example

-avplay "rtmp://myserver/live/mystream live=1"
+ffplay "rtmp://myserver/live/mystream live=1"

 @end example
 
 @section rtp
 @end example
 
 @section rtp


@@ -249,7 +249,7 @@ The required syntax for a RTSP url is:
 rtsp://@var{hostname}[:@var{port}]/@var{path}
 @end example
 
 rtsp://@var{hostname}[:@var{port}]/@var{path}
 @end example
 

-The following options (set on the @file{avconv}/@file{avplay} command
+The following options (set on the @command{ffmpeg}/@file{ffplay} command

 line, or set in code via @code{AVOption}s or in @code{avformat_open_input}),
 are supported:
 
 line, or set in code via @code{AVOption}s or in @code{avformat_open_input}),
 are supported:
 


@@ -288,7 +288,7 @@ When receiving data over UDP, the demuxer tries to reorder received packets
 order for this to be enabled, a maximum delay must be specified in the
 @code{max_delay} field of AVFormatContext.
 
 order for this to be enabled, a maximum delay must be specified in the
 @code{max_delay} field of AVFormatContext.
 

-When watching multi-bitrate Real-RTSP streams with @file{avplay}, the
+When watching multi-bitrate Real-RTSP streams with @file{ffplay}, the

 streams to display can be chosen with @code{-vst} @var{n} and
 @code{-ast} @var{n} for video and audio respectively, and can be switched
 on the fly by pressing @code{v} and @code{a}.
 streams to display can be chosen with @code{-vst} @var{n} and
 @code{-ast} @var{n} for video and audio respectively, and can be switched
 on the fly by pressing @code{v} and @code{a}.


@@ -298,13 +298,13 @@ Example command lines:
 To watch a stream over UDP, with a max reordering delay of 0.5 seconds:
 
 @example
 To watch a stream over UDP, with a max reordering delay of 0.5 seconds:
 
 @example

-avplay -max_delay 500000 -rtsp_transport udp rtsp://server/video.mp4
+ffplay -max_delay 500000 -rtsp_transport udp rtsp://server/video.mp4

 @end example
 
 To watch a stream tunneled over HTTP:
 
 @example
 @end example
 
 To watch a stream tunneled over HTTP:
 
 @example

-avplay -rtsp_transport http rtsp://server/video.mp4
+ffplay -rtsp_transport http rtsp://server/video.mp4

 @end example
 
 To send a stream in realtime to a RTSP server, for others to watch:
 @end example
 
 To send a stream in realtime to a RTSP server, for others to watch:


@@ -365,13 +365,13 @@ To broadcast a stream on the local subnet, for watching in VLC:
 ffmpeg -re -i @var{input} -f sap sap://224.0.0.255?same_port=1
 @end example
 
 ffmpeg -re -i @var{input} -f sap sap://224.0.0.255?same_port=1
 @end example
 

-Similarly, for watching in avplay:
+Similarly, for watching in ffplay:

 
 @example
 ffmpeg -re -i @var{input} -f sap sap://224.0.0.255
 @end example
 
 
 @example
 ffmpeg -re -i @var{input} -f sap sap://224.0.0.255
 @end example
 

-And for watching in avplay, over IPv6:
+And for watching in ffplay, over IPv6:

 
 @example
 ffmpeg -re -i @var{input} -f sap sap://[ff0e::1:2:3:4]
 
 @example
 ffmpeg -re -i @var{input} -f sap sap://[ff0e::1:2:3:4]


@@ -396,13 +396,13 @@ Example command lines follow.
 To play back the first stream announced on the normal SAP multicast address:
 
 @example
 To play back the first stream announced on the normal SAP multicast address:
 
 @example

-avplay sap://
+ffplay sap://

 @end example
 
 To play back the first stream announced on one the default IPv6 SAP multicast address:
 
 @example
 @end example
 
 To play back the first stream announced on one the default IPv6 SAP multicast address:
 
 @example

-avplay sap://[ff0e::2:7ffe]
+ffplay sap://[ff0e::2:7ffe]

 @end example
 
 @section tcp
 @end example
 
 @section tcp


@@ -421,7 +421,7 @@ Listen for an incoming connection
 
 @example
 ffmpeg -i @var{input} -f @var{format} tcp://@var{hostname}:@var{port}?listen
 
 @example
 ffmpeg -i @var{input} -f @var{format} tcp://@var{hostname}:@var{port}?listen

-avplay tcp://@var{hostname}:@var{port}
+ffplay tcp://@var{hostname}:@var{port}

 @end example
 
 @end table
 @end example
 
 @end table


@@ -472,7 +472,7 @@ For receiving, this gives the benefit of only receiving packets from
 the specified peer address/port.
 @end table
 
 the specified peer address/port.
 @end table
 

-Some usage examples of the udp protocol with @file{ffmpeg} follow.
+Some usage examples of the udp protocol with @command{ffmpeg} follow.

 
 To stream over UDP to a remote endpoint:
 @example
 
 To stream over UDP to a remote endpoint:
 @example