Merge commit '3fe26bb6'

* commit '3fe26bb6':
  hlsenc: write playlist into a temp file and replace the original atomically

Conflicts:
	libavformat/hlsenc.c

See: da97e4c6Merged-by: Michael Niedermayer <michaelni@gmx.at>