Changeset 72196a4b in ffmpeg

Timestamp:

Aug 28, 2013, 10:34:33 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a8ddafb0

Parents:

7efa9b17 (diff), 310cc4bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (08/28/13 10:34:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/28/13 10:34:33)

Message:

Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'

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

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

(No files)