[FFmpeg-cvslog] Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  5 15:12:54 2012 +0200| [1bd22229d7bf582d2749d4f96e1e2fca7f1dc044] | committer: Michael Niedermayer

Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'

* commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87':
  segment: Use the public av_write_header/av_write_trailer functions

Conflicts:
	libavformat/segment.c

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

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