[FFmpeg-cvslog] Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  2 18:15:13 2012 +0200| [513042c92669dbfcd604a9dcdb96176e05ecba90] | committer: Michael Niedermayer

Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'

* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd':
  avformat: split muxing functions from util.c

Conflicts:
	libavformat/internal.h
	libavformat/utils.c

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

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