Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 19 Apr 2016 13:41:19 +0000 (14:41 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 19 Apr 2016 13:41:19 +0000 (14:41 +0100)
commit90eb24996913238e1ad23d412fa3fa0fd93243c0
treed6c2a3a6e91add4e2b6ccc9e7904e1c34898990e
parent13406b6124a5120ad029476119b3cdc010fdf0b7
parent933dec0e29ec4d2cb83474279a6c52d62fdb7310
Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'

* commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310':
  file: Add an option for following a file that is being written

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/protocols.texi
libavformat/file.c
libavformat/version.h