* commit '0edae4e6':
  segment: Properly create new AVStreams for the chained muxer
  segment: Add a missing space

Conflicts:
	libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>