[FFmpeg-cvslog] Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 16:37:22 2014 +0200| [217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b] | committer: Michael Niedermayer

Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'

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

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b
---