[FFmpeg-cvslog] Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 28 12:34:29 2013 +0200| [72196a4b8d4bf3fcd273d30334b993dc8b909b22] | committer: Michael Niedermayer

Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

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

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

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