* commit 'f5ba67ee':
  flacenc: Move a scratch buffer to struct used by the function

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