Merge commit '3fe26bb60858951710a42065c8183cce100d632a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 00:59:15 +0000 (01:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Feb 2015 00:59:32 +0000 (01:59 +0100)
* commit '3fe26bb60858951710a42065c8183cce100d632a':
  hlsenc: write playlist into a temp file and replace the original atomically

Conflicts:
libavformat/hlsenc.c

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

Trivial merge