[FFmpeg-cvslog] Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Feb 29 16:59:47 2016 +0000| [53025fe1870afb19ee715e80615a1fc497dab13e] | committer: Derek Buitenhuis

Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53025fe1870afb19ee715e80615a1fc497dab13e
---