Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:35:12 +0000 (15:35 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:35:12 +0000 (15:35 +0100)
commit4eef36a4f6db1feb9d628337bd96e07a9b482c1a
treef0213266326848e00b8a127ff28fd5870f0f4827
parent94e5f0922b72f0a40ed328b70572ed868571cb96
parentd44f3e4059506a182f59218b1e967d42b01e097c
Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'

* commit 'd44f3e4059506a182f59218b1e967d42b01e097c':
  avio: Apply avoptions on the URLContext itself as well

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