ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 21
01:59:15 2015 +0100| [f56f0e091fbd8a6c917f02c291628717497276fc] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f56f0e091fbd8a6c917f02c291628717497276fc
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
