[FFmpeg-cvslog] Merge commit 'eb447d515956b3ce182d9750083131735f00324c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  5 15:41:45 2012 +0200| [008d36ba1de3aa0e55b0e6c8298b11be6c6bef1f] | committer: Michael Niedermayer

Merge commit 'eb447d515956b3ce182d9750083131735f00324c'

* commit 'eb447d515956b3ce182d9750083131735f00324c':
  segment: Free and reinit the muxer before calling avformat_write_header

Conflicts:
	libavformat/segment.c

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

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