OSDN Git Service

Merge commit 'ccea588f831906084b8c8235222920e6984beb72'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:47:05 +0000 (15:47 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:47:54 +0000 (15:47 +0100)
commit299d4f9428c2f4d16a1575d80d80caacdd850606
tree79ed46565ed50be08459daa2d66f5f5789fb625d
parent4eef36a4f6db1feb9d628337bd96e07a9b482c1a
parentccea588f831906084b8c8235222920e6984beb72
Merge commit 'ccea588f831906084b8c8235222920e6984beb72'

* commit 'ccea588f831906084b8c8235222920e6984beb72':
  avio: Add an option 'rw_timeout'

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