[FFmpeg-cvslog] Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  2 18:48:56 2012 +0200| [dd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c] | committer: Michael Niedermayer

Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'

* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac':
  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=dd78e1090b4cae3fbaa71e266c4b6b2f82ea9b7c
---