]> git.sesse.net Git - ffmpeg/commit
Merge commit 'a2fc8dbae85339d1b418d296f2982b6c04c53c57'
authorJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 00:56:19 +0000 (21:56 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 00:56:19 +0000 (21:56 -0300)
commita123e576a485931013c9fae85025d0e78ff3102d
tree635c45ad152bc554d098856c8c539ad75990dcb4
parenta959e38f7a7195d80bb2f3fe38a5af398067d2c7
parenta2fc8dbae85339d1b418d296f2982b6c04c53c57
Merge commit 'a2fc8dbae85339d1b418d296f2982b6c04c53c57'

* commit 'a2fc8dbae85339d1b418d296f2982b6c04c53c57':
  Add Haivision SRT protocol

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