Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 15:42:19 +0000 (17:42 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 15:52:23 +0000 (17:52 +0200)
commitba12ba859aabfa7153ba397d869db13acdaba340
treea4cb72af4f5c21ec64bd9af3e326c1b2ad18a7d6
parent8e67599505e3b0a968227a1dcd40020dff874001
parent0c73a5a53cc97f4291bbe9e1e68226edf6161744
Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'

* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/hls.c