Merge commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:11:23 +0000 (19:11 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:11:23 +0000 (19:11 -0300)
commitb1b0e532583e26f18ba27f3cc8775dbd62f3bc2b
tree16164ead14c83ba411ab1f3d8fa2fb75e574246b
parentb4ca32414ea28ad29b4bd387c298f5a676dace2a
parentea8ae27a5e112d06fd5625f640e40849e6313f0c
Merge commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c'

* commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c':
  avformat/libsrt: add payload size option

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