* commit 'aa69cbc9':
  flac muxer: add option to disable writing the global header

Conflicts:
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>