ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Tue Aug 18
08:50:22 2015 +0200| [1907e19d0ce2ad752912d73b798ebf4494aa1b1c] | committer:
Hendrik Leppkes
Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33'
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
movenc: Add a new flag for writing global sidx indexes for dash
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Hendrik Leppkes <h.lepp...@gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1907e19d0ce2ad752912d73b798ebf4494aa1b1c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
