Changeset f56f0e09 in ffmpeg

Timestamp:

Feb 21, 2015, 12:59:32 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3fdcb8cc

Parents:

e78a729 (diff), 3fe26bb6 (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> (02/21/15 00:59:15)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/21/15 00:59:32)

Message:

Merge commit '3fe26bb60858951710a42065c8183cce100d632a'

• commit '3fe26bb60858951710a42065c8183cce100d632a': hlsenc: write playlist into a temp file and replace the original atomically

Conflicts:

libavformat/hlsenc.c

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

(No files)