Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 16:59:47 +0000 (16:59 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 17:00:44 +0000 (17:00 +0000)
commit53025fe1870afb19ee715e80615a1fc497dab13e
treeb52e4ceb29f961ff76ea1dd11ffe0fced9e8edcc
parent8fd5342463b07fdfe2f6e89620182380c1c10ab8
parent7d61dc95d741ca134d59b1f34c4e10c4c4e36f56
Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'

* commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56':
  lavf: move urlcontext_child_class_next() to protocols.c

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