[FFmpeg-cvslog] Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'
Michael Niedermayer
git at videolan.org
Mon Nov 17 23:08:58 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 23:02:02 2014 +0100| [4dc305d784ea01efd30871e9aa6625eff66e9e87] | committer: Michael Niedermayer
Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'
* commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5':
movenc: Allow writing a DASH sidx atom at the start of files
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4dc305d784ea01efd30871e9aa6625eff66e9e87
---
More information about the ffmpeg-cvslog
mailing list