Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:26:49 +0000 (16:26 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:27:14 +0000 (16:27 +0000)
commitd0fc5de3a643fe7f974ed14e410c2ac2f4147d7e
tree3109a5cc04e7b973b8da67fb1eb27d81e99dda50
parenta588c7ac13bce3ef327ae2490e0974b65242c01f
parent81306fd4bdeb5c17d4db771e4fec684773b5790f
Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f'

* commit '81306fd4bdeb5c17d4db771e4fec684773b5790f':
  hls: eliminate ffurl_* usage

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