Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

* commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd':
  smoothstreamingenc: Write to a temp file while updating the manifest

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

diff --cc libavformat/smoothstreamingenc.c
Simple merge