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

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