ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 25
02:14:15 2014 +0100| [71ecfcf2d31e4f906f52c3450f4fb46c5087f50e] | committer:
Michael Niedermayer
Merge commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c'
* commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c':
lavf: Don't try to update files atomically with renames on windows
Conflicts:
libavformat/dashenc.c
libavformat/hdsenc.c
libavformat/internal.h
libavformat/smoothstreamingenc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71ecfcf2d31e4f906f52c3450f4fb46c5087f50e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
