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)
* commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd':
  smoothstreamingenc: Write to a temp file while updating the manifest

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

Simple merge