[FFmpeg-cvslog] Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
Michael Niedermayer
git at videolan.org
Fri Sep 20 12:26:29 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 11:56:26 2013 +0200| [04ee57ce0aba34722e47419fce5977f81ea09d07] | committer: Michael Niedermayer
Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
* commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5':
asfenc: mux chapters in ASF files using an ASF "marker" section
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04ee57ce0aba34722e47419fce5977f81ea09d07
---
More information about the ffmpeg-cvslog
mailing list