[FFmpeg-cvslog] Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  5 16:14:06 2012 +0200| [50c555e3966371f3db6ab4aeb19404094e351e4e] | committer: Michael Niedermayer

Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'

* commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e':
  segment: Add an option for disabling writing of a header/trailer to each segment

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50c555e3966371f3db6ab4aeb19404094e351e4e
---