ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug 5
13:58:10 2014 +0200| [a53a107a2f04a3f4311bd2e34f3d1aa10cc4570e] | committer:
Michael Niedermayer
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
movenc: Add option to disable nero chapters
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a53a107a2f04a3f4311bd2e34f3d1aa10cc4570e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
