ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4dc305d784ea01efd30871e9aa6625eff66e9e87
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
