Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 14:55:09 +0000 (15:55 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 14:55:09 +0000 (15:55 +0100)
commitf8e89d8a297e034d03aac88c73acd1541167ae5e
tree036de2728a2748e27d01f273ba431f411eb7b018
parentbe5fde92ff6cf920e2e7d58a864dcf5527404564
parentfab8156b2f30666adabe227b3d7712fd193873b1
Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'

* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
  avio: Copy URLContext generic options into child URLContexts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
25 files changed:
libavformat/async.c
libavformat/avio.c
libavformat/aviobuf.c
libavformat/cache.c
libavformat/concat.c
libavformat/crypto.c
libavformat/ftp.c
libavformat/gopher.c
libavformat/hlsproto.c
libavformat/http.c
libavformat/icecast.c
libavformat/md5proto.c
libavformat/mmst.c
libavformat/rtmpcrypt.c
libavformat/rtmpproto.c
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtspdec.c
libavformat/sapdec.c
libavformat/sapenc.c
libavformat/smoothstreamingenc.c
libavformat/srtpproto.c
libavformat/subfile.c
libavformat/tls.c
libavformat/url.h