Merge commit 'a507af97eef468238d545ff954a39d7432832e54'

* commit 'a507af97eef468238d545ff954a39d7432832e54':
  avformat/libsrt: add latency options and deprecate tspbdelay

Merged-by: James Almer <jamrial@gmail.com>

diff --cc doc/protocols.texi
index 6322581c86705121e36b8086a0c436fef9b77605,c3d6e150e0052aaad578c1b2a372ba8489a2bdbf..fad6c44c24558df85e4c24673d3bcee5f40469db
--- 1/doc/protocols.texi
--- 2/doc/protocols.texi
+++ b/doc/protocols.texi
@@@ -1267,9 -777,10 +1278,13 @@@ wrapping a live stream in very small fr
  use a bigger maximum frame size, though not greater than
  1456 bytes.
  
 +@item pkt_size=@var{bytes}
 +Alias for @samp{payload_size}.
 +
+ @item peerlatency
+ The latency value (as described in @option{rcvlatency}) that is
+ set by the sender side as a minimum value for the receiver.
+ 
  @item pbkeylen=@var{bytes}
  Sender encryption key length, in bytes.
  Only can be set to 0, 16, 24 and 32.

diff --cc libavformat/libsrt.c
index cb30f23eb3b738bbc7dd0821863ae6c618afb0e6,8e44ce6b80f2c2681a1d1ee9a4a591a7479dbb66..c19d85192feb0bab4f45caa42c88d32b880aa2a8
--- 1/libavformat/libsrt.c
--- 2/libavformat/libsrt.c
+++ b/libavformat/libsrt.c
@@@ -297,11 -294,13 +304,13 @@@ static int libsrt_set_options_pre(URLCo
          (s->ffs >= 0 && libsrt_setsockopt(h, fd, SRTO_FC, "SRTO_FC", &s->ffs, sizeof(s->ffs)) < 0) ||
          (s->ipttl >= 0 && libsrt_setsockopt(h, fd, SRTO_IPTTL, "SRTO_UPTTL", &s->ipttl, sizeof(s->ipttl)) < 0) ||
          (s->iptos >= 0 && libsrt_setsockopt(h, fd, SRTO_IPTOS, "SRTO_IPTOS", &s->iptos, sizeof(s->iptos)) < 0) ||
-         (tsbpddelay >= 0 && libsrt_setsockopt(h, fd, SRTO_TSBPDDELAY, "SRTO_TSBPDELAY", &tsbpddelay, sizeof(tsbpddelay)) < 0) ||
+         (s->latency >= 0 && libsrt_setsockopt(h, fd, SRTO_LATENCY, "SRTO_LATENCY", &latency, sizeof(latency)) < 0) ||
+         (s->rcvlatency >= 0 && libsrt_setsockopt(h, fd, SRTO_RCVLATENCY, "SRTO_RCVLATENCY", &rcvlatency, sizeof(rcvlatency)) < 0) ||
+         (s->peerlatency >= 0 && libsrt_setsockopt(h, fd, SRTO_PEERLATENCY, "SRTO_PEERLATENCY", &peerlatency, sizeof(peerlatency)) < 0) ||
          (s->tlpktdrop >= 0 && libsrt_setsockopt(h, fd, SRTO_TLPKTDROP, "SRTO_TLPKDROP", &s->tlpktdrop, sizeof(s->tlpktdrop)) < 0) ||
          (s->nakreport >= 0 && libsrt_setsockopt(h, fd, SRTO_NAKREPORT, "SRTO_NAKREPORT", &s->nakreport, sizeof(s->nakreport)) < 0) ||
 -        (connect_timeout >= 0 && libsrt_setsockopt(h, fd, SRTO_CONNTIMEO, "SRTO_CONNTIMEO", &connect_timeout, sizeof(connect_timeout)) < 0) ||
 -        (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0)) {
 +        (connect_timeout >= 0 && libsrt_setsockopt(h, fd, SRTO_CONNTIMEO, "SRTO_CONNTIMEO", &connect_timeout, sizeof(connect_timeout)) <0 )) ||
 +        (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) {
          return AVERROR(EIO);
      }
      return 0;

diff --cc libavformat/version.h
index b65ba19f3cfda811fbef27202a4200ab2f725215,016f266f1ff96210255b21c98bf96f1fb885f5fe..9496b72200ceb1452920576826706ec4c35815a0
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -29,11 -29,9 +29,11 @@@
  
  #include "libavutil/version.h"
  
 -#define LIBAVFORMAT_VERSION_MAJOR 58
 -#define LIBAVFORMAT_VERSION_MINOR  2
 -#define LIBAVFORMAT_VERSION_MICRO  0
 +// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
 +// Also please add any ticket numbers that you believe might be affected here
 +#define LIBAVFORMAT_VERSION_MAJOR  58
 +#define LIBAVFORMAT_VERSION_MINOR  17
- #define LIBAVFORMAT_VERSION_MICRO 105
++#define LIBAVFORMAT_VERSION_MICRO 106
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \