ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Nov 17
21:55:23 2014 +0100| [9e0b0c60bd7fa4d4a476b93f94436a8e37d98983] | committer:
Michael Niedermayer
Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'
* commit '2ded57371abead879bcee56da5131e5fac0d17ef':
movenc: Add support for writing sidx atoms for DASH segments
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e0b0c60bd7fa4d4a476b93f94436a8e37d98983
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
