* commit '5a70a783':
  hls: Add an option to prepend a baseurl to the playlist entries

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>