[FFmpeg-cvslog] Merge commit '0edae4e6286096023cdd6adea74722fa06029867'
Michael Niedermayer
git at videolan.org
Fri Oct 5 15:06:45 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 5 15:03:02 2012 +0200| [d19728da6f0048d4f6208a34c849aee61c8e2b2a] | committer: Michael Niedermayer
Merge commit '0edae4e6286096023cdd6adea74722fa06029867'
* commit '0edae4e6286096023cdd6adea74722fa06029867':
segment: Properly create new AVStreams for the chained muxer
segment: Add a missing space
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d19728da6f0048d4f6208a34c849aee61c8e2b2a
---
More information about the ffmpeg-cvslog
mailing list