ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Oct 12 23:26:28 2014 +0200| [ca5a77191b79e8ff46402e2db6f1bf18d034f9e8] | committer: Michael Niedermayer
Merge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee' * commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee': movenc: Write edit lists for fragmented files as well, if necessary Conflicts: libavformat/movenc.c The default for writing EDTS for fragmented mp4 is left at disabled this can be overridden via command line with -use_editlist but EDTS + fragments still does not fully work, which is why it is left disabled by default Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca5a77191b79e8ff46402e2db6f1bf18d034f9e8 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog