Merge commit 'a507af97eef468238d545ff954a39d7432832e54'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:11:45 +0000 (19:11 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:11:45 +0000 (19:11 -0300)
commitde33b3e457a656230fc6d544a1889218d77a5b3c
tree00c27842a2b92e62c0f7beae48506814c5376b57
parentb1b0e532583e26f18ba27f3cc8775dbd62f3bc2b
parenta507af97eef468238d545ff954a39d7432832e54
Merge commit 'a507af97eef468238d545ff954a39d7432832e54'

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

Merged-by: James Almer <jamrial@gmail.com>
doc/protocols.texi
libavformat/libsrt.c
libavformat/version.h