diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 01:59:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 01:59:32 +0100 |
| commit | f56f0e091fbd8a6c917f02c291628717497276fc (patch) | |
| tree | a1489b167d0104aeb9962a3da22199d6f6a98bdf | |
| parent | e78a729163c70af61856689f71c0ad9913fbc5d2 (diff) | |
| parent | 3fe26bb60858951710a42065c8183cce100d632a (diff) | |
| download | ffmpeg-f56f0e091fbd8a6c917f02c291628717497276fc.tar.gz | |
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>
0 files changed, 0 insertions, 0 deletions