Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:34:29 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Aug 2013 10:34:33 +0000 (12:34 +0200)
commit72196a4b8d4bf3fcd273d30334b993dc8b909b22
treed3fec7ed9b428b06c6ca3bcbb498250d1749e9fe
parent7efa9b1794d27372f714c0aae3111acceae7f33a
parent310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd
Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/smoothstreamingenc.c