ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Nov 26
11:27:17 2014 +0100| [b78074fd13ad340b8ea4bb83440da336a0de1e40] | committer:
Michael Niedermayer
Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'
* commit 'ee37620b6ae4783cda637408422044b2d14a688c':
movenc: Add a flag for indicating a discontinuous fragment
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b78074fd13ad340b8ea4bb83440da336a0de1e40
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
