* commit 'e19d48df':
  flac muxer: support reading updated extradata from side data

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