[FFmpeg-cvslog] fix several typos

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsnick at gmx.net> | Fri Jun 20 10:16:01 2014 +0200| [10b8481a26346c5586185f65f6f4fca216277fdf] | committer: Lou Logan

fix several typos

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10b8481a26346c5586185f65f6f4fca216277fdf
---

 doc/protocols.texi |    8 ++++----
 libavformat/rtsp.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 133512a..cd9126c 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -710,7 +710,7 @@ Do not start playing the stream immediately if set to 1. Default value
 is 0.
 
 @item rtsp_transport
-Set RTSP trasport protocols.
+Set RTSP transport protocols.
 
 It accepts the following values:
 @table @samp
@@ -769,17 +769,17 @@ Set maximum local UDP port. Default value is 65000.
 @item timeout
 Set maximum timeout (in seconds) to wait for incoming connections.
 
-A value of -1 mean infinite (default). This option implies the
+A value of -1 means infinite (default). This option implies the
 @option{rtsp_flags} set to @samp{listen}.
 
 @item reorder_queue_size
 Set number of packets to buffer for handling of reordered packets.
 
 @item stimeout
-Set socket TCP I/O timeout in micro seconds.
+Set socket TCP I/O timeout in microseconds.
 
 @item user-agent
-Override User-Agent header. If not specified, it default to the
+Override User-Agent header. If not specified, it defaults to the
 libavformat identifier string.
 @end table
 
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 8960a9a..dfd0f83 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -91,7 +91,7 @@ const AVOption ff_rtsp_options[] = {
     { "min_port", "set minimum local UDP port", OFFSET(rtp_port_min), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MIN}, 0, 65535, DEC|ENC },
     { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
     { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
-    { "stimeout", "set timeout (in micro seconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
+    { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
     RTSP_REORDERING_OPTS(),
     { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
     { NULL },