[FFmpeg-cvslog] Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  2 18:31:47 2012 +0200| [6cbbf4a274d42f92cdd2e98e83e95e23cbfbf976] | committer: Michael Niedermayer

Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'

* commit '86bbdf865e04bc5ddc2021b0620e6de634375253':
  avformat: refactor avformat_write_header

Conflicts:
	libavformat/mux.c

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

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